Skip to content

Commit 041d609

Browse files
committed
Fixing the last issues since rebase.
1 parent 95c9f31 commit 041d609

File tree

4 files changed

+3
-54
lines changed

4 files changed

+3
-54
lines changed

roles/_init/tasks/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@
116116
ansible.builtin.set_fact:
117117
live_symlink_build_dest: "{{ live_symlink_build_dest | default('{{ build_base_path }}/live.{{ project_name }}_{{ build_type }}') }}"
118118

119-
- name: Set the previous deploy's path for later use where we need to manipulate the live site.
120-
ansible.builtin.set_fact:
121-
previous_deploy_path: "{{ previous_deploy_path | default('{{ deploy_path_prefix }}{{ previous_build_number }}') }}"
122-
123119
- name: Overwrite deploy and live_symlink paths if SquashFS deploy.
124120
ansible.builtin.set_fact:
125121
deploy_path: "{{ build_path | default('{{ build_path_prefix }}{{ build_number }}') }}"

roles/cache_clear/cache_clear-drupal8/tasks/main.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,6 @@
88
- name: Override deploy_path.
99
set_fact:
1010
deploy_path: "{{ live_symlink_dest }}"
11-
12-
- name: Truncate table cache_container.
13-
ansible.builtin.command:
14-
cmd: "{{ drush_bin }} sql-query 'TRUNCATE TABLE cache_container'"
15-
chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site_drupal.folder }}"
16-
become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
17-
become_user: "{{ www_user }}"
18-
with_items: "{{ drupal.sites }}"
19-
loop_control:
20-
loop_var: site_drupal
21-
run_once: true
22-
register: _drush_output
23-
when: drupal.truncate_cache_table
24-
25-
- name: Show drush output.
26-
ansible.builtin.debug:
27-
msg: "{{ _drush_output }}"
28-
when:
29-
- drupal.drush_verbose_output
30-
- drupal.truncate_cache_table
3111
when:
3212
- deploy_code.mount_type is defined
3313
- deploy_code.mount_type == "squashfs"

roles/cron/cron_drupal8/tasks/job.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,6 @@
3535
state: present
3636
when: drupal.cron_mailto is defined
3737
delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
38-
become: true
39-
40-
#- name: Remove existing MAILTO entry (if any)
41-
# community.general.cronvar:
42-
# name: MAILTO
43-
# state: absent
44-
# delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
45-
46-
#- name: Set global MAILTO for cron jobs (if defined)
47-
# community.general.cronvar:
48-
# name: MAILTO
49-
# value: "{{ drupal.cron_mailto | default(omit) }}"
50-
# state: present
51-
# when: drupal.cron_mailto is defined and drupal.cron_mailto | length > 0
52-
# delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
5338

5439
- name: Setup Drupal cron tasks on app server.
5540
ansible.builtin.cron:

roles/sync/database_sync/database_sync-mysql/tasks/sync.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
when:
4848
- mysql_sync.archival_method == 'gzip'
4949

50-
- name: Register remote dump name (from database) - BZIP2.
50+
- name: Register remote dump name (from database).
5151
ansible.builtin.set_fact:
5252
mysql_sync_source_dump_path: "/tmp/{{ database.source.database }}_{{ build_number }}_source.sql.{{ archive_file_type }}"
5353
when:
@@ -128,16 +128,6 @@
128128
ansible.builtin.set_fact:
129129
mysql_sync_target_dump_unpacked_path: "/tmp/{{ database.target.database }}_{{ build_number }}_target.sql"
130130

131-
- name: Register tmp target dump name - GZIP.
132-
ansible.builtin.set_fact:
133-
mysql_sync_target_dump_path: "/tmp/{{ database.target.database }}_{{ build_number }}_target.sql.gz"
134-
when:
135-
- mysql_sync.use_gzip
136-
137-
- name: Register tmp unpacked target dump name.
138-
ansible.builtin.set_fact:
139-
mysql_sync_target_dump_unpacked_path: "/tmp/{{ database.target.database }}_{{ build_number }}_target.sql"
140-
141131
- name: Get target last known good build number.
142132
ansible.builtin.command:
143133
argv:
@@ -180,12 +170,10 @@
180170
ansible.builtin.shell: "{{ archival_command }} -d -c {{ mysql_sync_target_dump_path }} > {{ mysql_sync_target_dump_unpacked_path }}"
181171
args:
182172
executable: /bin/bash
183-
when:
184-
- not mysql_sync.use_gzip
185173

186-
- name: Delete temporary unpacked dump file on target.
174+
- name: Delete temporary dump file on target.
187175
ansible.builtin.file:
188-
path: "{{ mysql_sync_target_dump_unpacked_path }}"
176+
path: "{{ mysql_sync_target_dump_path }}"
189177
state: absent
190178

191179
- name: Drop target database.

0 commit comments

Comments
 (0)