Skip to content

Commit 15ae901

Browse files
authored
Mysql db name pr 1.x (#264)
* Adding escaped backticks to db names to be safe. * Looks like Ansible auto-escapes backticks. * Adding backticks to database names for creating MySQL users too. * Adding extra mysqldump flags to stop restores failing on RDS. * Removing ignore_errors. * Updating mysqldump query.
1 parent 8c30320 commit 15ae901

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

roles/_init/defaults/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
# this will ensure defaults to other roles too.
44
# If you are using ce-provision to deploy infrastructure this must match the `user_deploy.username` variable
55
deploy_user: "deploy"
6-
_mysqldump_params: "--set-gtid-purged=OFF --skip-definer --max-allowed-packet=128M --single-transaction --skip-opt -e --quick --skip-disable-keys --skip-add-locks -C -a --add-drop-table"
6+
# for MySQL CE you might want to add '--set-gtid-purged=OFF --skip-definer' here
7+
_mysqldump_params: "--max-allowed-packet=128M --single-transaction --skip-opt -e --quick --skip-disable-keys --skip-add-locks -C -a --add-drop-table"
78
drupal:
89
sites:
910
- folder: "default"

roles/deploy_code/tasks/cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
- name: Check if we have a mount already.
129129
ansible.builtin.shell:
130130
cmd: "mount | grep {{ deploy_base_path }}"
131-
ignore_errors: true
131+
failed_when: false
132132
register: _deploy_code_mount_check
133133
when:
134134
- deploy_code.mount_sync is defined

roles/lhci_run/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
- name: Check if 'lhci' is available.
33
ansible.builtin.command: "which lhci"
44
register: _lhci_run_check_result
5-
ignore_errors: true
5+
failed_when: false
66

77
- name: Check if 'Xvfb' is running.
88
ansible.builtin.shell: "pgrep Xvfb"
99
register: _lhci_run_check_xvfb_result
10-
ignore_errors: true
10+
failed_when: false
1111
when:
1212
- _lhci_run_check_result.rc == 0
1313

0 commit comments

Comments
 (0)