Skip to content

Commit cbf1974

Browse files
committed
Fixes geerlingguy#34: Update Drupal example.
1 parent 4ae1518 commit cbf1974

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.vagrant/
33
vagrant_ansible_inventory_default
44
*.cache
5+
*.retry

drupal/Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
VAGRANTFILE_API_VERSION = "2"
55

66
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
7-
config.vm.box = "geerlingguy/ubuntu1204"
7+
config.vm.box = "geerlingguy/ubuntu1404"
88
config.vm.network :private_network, ip: "192.168.88.8"
99
config.ssh.insert_key = false
1010

drupal/provisioning/playbook.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
- python-pycurl
2121

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

2525
- name: "Install Apache, MySQL, PHP, and other dependencies."
2626
apt: "name={{ item }} state=present"
@@ -37,7 +37,7 @@
3737
- php5-gd
3838
- php5-dev
3939
- php5-mcrypt
40-
- php-apc
40+
- php5-apcu
4141
- php-pear
4242
- python-mysqldb
4343
- mysql-server
@@ -131,6 +131,12 @@
131131
version: "{{ drupal_core_version }}"
132132
dest: "{{ drupal_core_path }}"
133133

134+
- name: Install Drupal dependencies with Composer.
135+
shell: >
136+
/usr/local/bin/composer install
137+
chdir={{ drupal_core_path }}
138+
creates={{ drupal_core_path }}/sites/default/settings.php
139+
134140
- name: Install Drupal.
135141
command: >
136142
drush si -y --site-name="{{ drupal_site_name }}"

drupal/provisioning/vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
# The core version you want to use (e.g. 6.x, 7.x, 8.0.x).
3-
drupal_core_version: "8.0.x"
2+
# The core version you want to use (e.g. 6.x, 7.x, 8.1.x).
3+
drupal_core_version: "8.1.x"
44

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

0 commit comments

Comments
 (0)