From 6a558c134c40f2d2ed5a010559c35d71e82010a2 Mon Sep 17 00:00:00 2001 From: gregharvey Date: Fri, 7 Oct 2022 12:46:59 +0200 Subject: [PATCH 1/2] Removing unnecessary lines in Drupal config generation. --- .../tasks/settings.yml | 16 ++++++--------- .../tasks/settings.yml | 20 ++++++++----------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/roles/config_generate/config_generate-drupal7/tasks/settings.yml b/roles/config_generate/config_generate-drupal7/tasks/settings.yml index 277899a0..f8e3b55e 100644 --- a/roles/config_generate/config_generate-drupal7/tasks/settings.yml +++ b/roles/config_generate/config_generate-drupal7/tasks/settings.yml @@ -1,25 +1,21 @@ --- -- name: set public files relative path. - set_fact: +- name: Set public files relative path. + ansible.builtin.set_fact: build_public_file_path: "{{ site.public_files }}" -- name: set public files path. - set_fact: - build_private_file_path: "{{ deploy_assets_base_path }}/{{ project_name }}_{{ build_type }}_{{ site.folder }}_private_files" - -- name: set private files path. - set_fact: +- name: Set private files path. + ansible.builtin.set_fact: build_private_file_path: "{{ deploy_assets_base_path }}/{{ project_name }}_{{ build_type }}_{{ site.folder }}_private_files" - name: Ensure file permissions on site folder. - file: + ansible.builtin.file: path: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}" state: directory mode: 0775 become: "{{ false if www_user == deploy_user else true }}" - name: Generates settings.php file. - template: + ansible.builtin.template: src: "{{ item }}" dest: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}/settings.php" with_first_found: diff --git a/roles/config_generate/config_generate-drupal8/tasks/settings.yml b/roles/config_generate/config_generate-drupal8/tasks/settings.yml index 70d9b113..ebf182e8 100644 --- a/roles/config_generate/config_generate-drupal8/tasks/settings.yml +++ b/roles/config_generate/config_generate-drupal8/tasks/settings.yml @@ -1,29 +1,25 @@ --- -- name: set public files relative path. - set_fact: +- name: Set public files relative path. + ansible.builtin.set_fact: build_public_file_path: "{{ site.public_files }}" -- name: set public files path. - set_fact: +- name: Set private files path. + ansible.builtin.set_fact: build_private_file_path: "{{ deploy_assets_base_path }}/{{ project_name }}_{{ build_type }}_{{ site.folder }}_private_files" -- name: set private files path. - set_fact: - build_private_file_path: "{{ deploy_assets_base_path }}/{{ project_name }}_{{ build_type }}_{{ site.folder }}_private_files" - -- name: set config directory path. - set_fact: +- name: Set config directory path. + ansible.builtin.set_fact: build_config_sync_directory: "{{ deploy_path }}/{{ site.config_sync_directory }}" - name: Ensure file permissions on site folder. - file: + ansible.builtin.file: path: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}" state: directory mode: 0775 become: "{{ false if www_user == deploy_user else true }}" - name: Generates settings.php file. - template: + ansible.builtin.template: src: "{{ item }}" dest: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}/settings.php" with_first_found: From c7f87579e5da317661c293582f65fb2c238fc90b Mon Sep 17 00:00:00 2001 From: gregharvey Date: Fri, 7 Oct 2022 16:04:30 +0200 Subject: [PATCH 2/2] Drupal 7 lacked the install_command var. --- roles/database_apply/database_apply-drupal7/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/database_apply/database_apply-drupal7/tasks/main.yml b/roles/database_apply/database_apply-drupal7/tasks/main.yml index 8b655bda..eb2edbfa 100644 --- a/roles/database_apply/database_apply-drupal7/tasks/main.yml +++ b/roles/database_apply/database_apply-drupal7/tasks/main.yml @@ -2,7 +2,7 @@ - name: Install Drupal. shell: - cmd: "{{ drush_bin }} -l {{ site.folder }} -y si" + cmd: "{{ drush_bin }} -l {{ site.folder }} {{ site.install_command }}" chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}" become: "{{ 'no' if www_user == deploy_user else 'yes' }}" become_user: "{{ www_user }}" @@ -45,4 +45,4 @@ include_tasks: ctools.yml with_items: "{{ drupal.sites }}" loop_control: - loop_var: site \ No newline at end of file + loop_var: site