Skip to content

Commit

Permalink
Fixes #34: Update Drupal example.
Browse files Browse the repository at this point in the history
  • Loading branch information
geerlingguy committed Jul 3, 2016
1 parent 4ae1518 commit cbf1974
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.vagrant/ .vagrant/
vagrant_ansible_inventory_default vagrant_ansible_inventory_default
*.cache *.cache
*.retry
2 changes: 1 addition & 1 deletion drupal/Vagrantfile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
VAGRANTFILE_API_VERSION = "2" VAGRANTFILE_API_VERSION = "2"


Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "geerlingguy/ubuntu1204" config.vm.box = "geerlingguy/ubuntu1404"
config.vm.network :private_network, ip: "192.168.88.8" config.vm.network :private_network, ip: "192.168.88.8"
config.ssh.insert_key = false config.ssh.insert_key = false


Expand Down
10 changes: 8 additions & 2 deletions drupal/provisioning/playbook.yml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
- python-pycurl - python-pycurl


- name: Add ondrej repository for later versions of PHP. - name: Add ondrej repository for later versions of PHP.
apt_repository: repo='ppa:ondrej/php5' update_cache=yes apt_repository: repo='ppa:ondrej/php5-5.6' update_cache=yes


- name: "Install Apache, MySQL, PHP, and other dependencies." - name: "Install Apache, MySQL, PHP, and other dependencies."
apt: "name={{ item }} state=present" apt: "name={{ item }} state=present"
Expand All @@ -37,7 +37,7 @@
- php5-gd - php5-gd
- php5-dev - php5-dev
- php5-mcrypt - php5-mcrypt
- php-apc - php5-apcu
- php-pear - php-pear
- python-mysqldb - python-mysqldb
- mysql-server - mysql-server
Expand Down Expand Up @@ -131,6 +131,12 @@
version: "{{ drupal_core_version }}" version: "{{ drupal_core_version }}"
dest: "{{ drupal_core_path }}" dest: "{{ drupal_core_path }}"


- name: Install Drupal dependencies with Composer.
shell: >
/usr/local/bin/composer install
chdir={{ drupal_core_path }}
creates={{ drupal_core_path }}/sites/default/settings.php
- name: Install Drupal. - name: Install Drupal.
command: > command: >
drush si -y --site-name="{{ drupal_site_name }}" drush si -y --site-name="{{ drupal_site_name }}"
Expand Down
4 changes: 2 additions & 2 deletions drupal/provisioning/vars.yml
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
--- ---
# The core version you want to use (e.g. 6.x, 7.x, 8.0.x). # The core version you want to use (e.g. 6.x, 7.x, 8.1.x).
drupal_core_version: "8.0.x" drupal_core_version: "8.1.x"


# The path where Drupal will be downloaded and installed. # The path where Drupal will be downloaded and installed.
drupal_core_path: "/var/www/drupal-{{ drupal_core_version }}-dev" drupal_core_path: "/var/www/drupal-{{ drupal_core_version }}-dev"
Expand Down

0 comments on commit cbf1974

Please sign in to comment.