diff --git a/roles/deploy_container/defaults/main.yml b/roles/deploy_container/defaults/main.yml index be178aca..f01dcb15 100644 --- a/roles/deploy_container/defaults/main.yml +++ b/roles/deploy_container/defaults/main.yml @@ -68,7 +68,7 @@ deploy_container: launch_type: FARGATE network_mode: awsvpc #volumes: [] # list of additional volumes to attach - target_group_name: example # 32 character limit + target_group_name: example # can have a maximum of 32 characters, must contain only alphanumeric characters or hyphens, and must not begin or end with a hyphen target_group_protocol: http target_group_port: 8080 # ports lower than 1024 will require the app to be configured to run as a privileged user in the Dockerfile target_group_wait_timeout: 200 # how long to wait for target group events to complete diff --git a/roles/sync/drupal_sync_tasks/cache_clear/cache_clear-drupal8/tasks/main.yml b/roles/sync/drupal_sync_tasks/cache_clear/cache_clear-drupal8/tasks/main.yml index 431366cf..0f116adc 100644 --- a/roles/sync/drupal_sync_tasks/cache_clear/cache_clear-drupal8/tasks/main.yml +++ b/roles/sync/drupal_sync_tasks/cache_clear/cache_clear-drupal8/tasks/main.yml @@ -1,16 +1,8 @@ --- -# Drupal 8 ships drush with the website code so we need the previous build in the path. -- name: Stash the drush_bin variable. - ansible.builtin.set_fact: - _drush_bin_deploy: "{{ drush_bin }}" - -- name: Update location of drush for the sync cache clear command. - ansible.builtin.set_fact: - drush_bin: "{{ live_symlink_dest }}/vendor/bin/drush" - +# Drupal 8 ships drush with the website code so to use the drush_live_bin variable - name: Clear Drupal cache. ansible.builtin.command: - cmd: "{{ drush_bin }} -l {{ site.folder }} -y cr" + cmd: "{{ drush_live_bin }} -l {{ site.folder }} -y cr" chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}" become: "{{ 'no' if www_user == deploy_user else 'yes' }}" become_user: "{{ www_user }}" @@ -18,7 +10,3 @@ loop_control: loop_var: site run_once: true - -- name: Restore the drush_bin variable. - ansible.builtin.set_fact: - drush_bin: "{{ _drush_bin_deploy }}" diff --git a/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal8/tasks/main.yml b/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal8/tasks/main.yml index d13b0129..297e476b 100644 --- a/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal8/tasks/main.yml +++ b/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal8/tasks/main.yml @@ -1,16 +1,8 @@ --- -# Drupal 8 ships drush with the website code so we need the previous build in the path. -- name: Stash the drush_bin variable. - ansible.builtin.set_fact: - _drush_bin_deploy: "{{ drush_bin }}" - -- name: Update location of drush for the update/config import commands. - ansible.builtin.set_fact: - drush_bin: "{{ live_symlink_dest }}/vendor/bin/drush" - +# Drupal 8 ships drush with the website code so to use the drush_live_bin variable - name: Apply Drupal database updates. ansible.builtin.command: - cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb" + cmd: "{{ drush_live_bin }} -l {{ site.folder }} -y updb" chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}" become: "{{ 'no' if www_user == deploy_user else 'yes' }}" become_user: "{{ www_user }}" @@ -27,7 +19,7 @@ # This only runs if the sync_config_import variable is not defined or it is defined and is true. If it's defined and false, this won't run. - name: Import configuration. ansible.builtin.command: - cmd: "{{ drush_bin }} -l {{ site.folder }} -y {{ site.config_import_command }}" + cmd: "{{ drush_live_bin }} -l {{ site.folder }} -y {{ site.config_import_command }}" chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}" become: "{{ 'no' if www_user == deploy_user else 'yes' }}" become_user: "{{ www_user }}" @@ -47,7 +39,3 @@ - name: Clear the cache. ansible.builtin.include_role: name: "sync/drupal_sync_tasks/cache_clear/cache_clear-{{ project_type }}" - -- name: Restore the drush_bin variable. - ansible.builtin.set_fact: - drush_bin: "{{ _drush_bin_deploy }}"