Skip to content

Commit 1d82720

Browse files
committedSep 4, 2019
Issue geerlingguy#169: Various fixes for typos and outdated usage.
1 parent 8961f9b commit 1d82720

File tree

10 files changed

+21
-28
lines changed

10 files changed

+21
-28
lines changed
 

‎drupal/provisioning/playbook.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@
9393
state: present
9494
notify: restart apache
9595

96-
- name: Remove the MySQL test database.
97-
mysql_db: db=test state=absent
98-
9996
- name: Create a MySQL database for Drupal.
10097
mysql_db: "db={{ domain }} state=present"
10198

@@ -120,7 +117,7 @@
120117
creates=/usr/local/bin/composer
121118
122119
- name: Move Composer into globally-accessible location.
123-
shell: >
120+
command: >
124121
mv /tmp/composer.phar /usr/local/bin/composer
125122
creates=/usr/local/bin/composer
126123
@@ -131,7 +128,7 @@
131128
dest: /opt/drush
132129

133130
- name: Install Drush dependencies with Composer.
134-
shell: >
131+
command: >
135132
/usr/local/bin/composer install
136133
chdir=/opt/drush
137134
creates=/opt/drush/vendor/autoload.php
@@ -149,7 +146,7 @@
149146
dest: "{{ drupal_core_path }}"
150147

151148
- name: Install Drupal dependencies with Composer.
152-
shell: >
149+
command: >
153150
/usr/local/bin/composer install
154151
chdir={{ drupal_core_path }}
155152
creates={{ drupal_core_path }}/vendor/autoload.php

‎includes/provisioning/tasks/composer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
creates=/usr/local/bin/composer
1313
1414
- name: Move Composer into globally-accessible location.
15-
shell: >
15+
command: >
1616
mv /tmp/composer.phar /usr/local/bin/composer
1717
creates=/usr/local/bin/composer

‎includes/provisioning/tasks/drupal.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
dest: "{{ drupal_core_path }}"
77

88
- name: Install Drupal dependencies with Composer.
9-
shell: >
9+
command: >
1010
/usr/local/bin/composer install
1111
chdir={{ drupal_core_path }}
1212
creates={{ drupal_core_path }}/vendor/autoload.php

‎includes/provisioning/tasks/drush.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
dest: /opt/drush
77

88
- name: Install Drush dependencies with Composer.
9-
shell: >
9+
command: >
1010
/usr/local/bin/composer install
1111
chdir=/opt/drush
1212
creates=/opt/drush/vendor/autoload.php

‎includes/provisioning/tasks/mysql.yml

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
---
2-
- name: Remove the MySQL test database.
3-
mysql_db: db=test state=absent
4-
52
- name: Create a MySQL database for Drupal.
63
mysql_db: "db={{ domain }} state=present"
74

‎nodejs-role/playbook.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
node_apps_location: /usr/local/opt/node
66

77
pre_tasks:
8-
- name: Install Remi repo.
9-
yum:
10-
name: "https://rpms.remirepo.net/enterprise/remi-release-7.rpm"
11-
state: present
12-
138
- name: Import Remi GPG key.
149
rpm_key:
1510
key: "https://rpms.remirepo.net/RPM-GPG-KEY-remi"
1611
state: present
1712

13+
- name: Install Remi repo.
14+
yum:
15+
name: "https://rpms.remirepo.net/enterprise/remi-release-7.rpm"
16+
state: present
17+
1818
- name: Install EPEL repo.
1919
yum: name=epel-release state=present
2020

‎nodejs/provisioning/playbook.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
become: yes
44

55
vars:
6-
# Vars can also be passed in via CLI with `--extra-vars="name=value"`.
76
node_apps_location: /usr/local/opt/node
87

98
tasks:
10-
- name: Install Remi repo.
11-
yum:
12-
name: "https://rpms.remirepo.net/enterprise/remi-release-7.rpm"
13-
state: present
14-
159
- name: Import Remi GPG key.
1610
rpm_key:
1711
key: "https://rpms.remirepo.net/RPM-GPG-KEY-remi"
1812
state: present
1913

14+
- name: Install Remi repo.
15+
yum:
16+
name: "https://rpms.remirepo.net/enterprise/remi-release-7.rpm"
17+
state: present
18+
2019
- name: Install EPEL repo.
2120
yum: name=epel-release state=present
2221

‎solr/Vagrantfile

-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
1616
# Ansible provisioner.
1717
config.vm.provision :ansible do |ansible|
1818
ansible.playbook = "provisioning/playbook.yml"
19-
ansible.become = true
2019
end
2120
end

‎solr/provisioning/playbook.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
- hosts: all
3+
become: true
34

45
vars_files:
56
- vars.yml
67

78
pre_tasks:
89
- name: Update apt cache if needed.
9-
apt: update_cache=yes cache_valid_time=3600
10+
apt: update_cache=true cache_valid_time=3600
1011

1112
handlers:
1213
- name: restart solr
@@ -30,7 +31,7 @@
3031
creates: "{{ download_dir }}/solr-{{ solr_version }}/README.txt"
3132

3233
- name: Run Solr installation script.
33-
shell: >
34+
command: >
3435
{{ download_dir }}/solr-{{ solr_version }}/bin/install_solr_service.sh
3536
{{ download_dir }}/solr-{{ solr_version }}.tgz
3637
-i /opt

‎solr/provisioning/vars.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ download_dir: /tmp
66
solr_dir: /opt/solr
77

88
# Solr version and download information.
9-
solr_version: 6.5.1
10-
solr_checksum: sha1:2cc43b837743949a46bd7efbab14b43f6d92b4b8
9+
solr_version: 8.2.0
10+
solr_checksum: sha512:beb4e37fc21bf483e3b6bae43cb06a49bc420a0f2b920c97909a69a5efeacba1e7d2ff09ae8018446c87bf007f88f06a59de73cd1923f0967e8206629b0509b6

0 commit comments

Comments
 (0)
Please sign in to comment.