2.x: Testing with ce_provision vars in drupal10 template

codeenigma · Mar 11, 2024 · d4e1ff6 · d4e1ff6
1 parent 87c50bb
commit d4e1ff6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/docker-images/controller-devel/provision-2.yml b/docker-images/controller-devel/provision-2.yml
@@ -3,8 +3,6 @@
   become: true
   vars:
     - _domain_name: example.com
-    - _ce_provision_base_dir: /home/ce-dev/ce-provision-2
-    - _ce_provision_build_dir: /home/ce-dev/ce-provision-2/ce-dev/ansible/local
     - _ce_provision_build_tmp_dir: /tmp
     - _ce_provision_data_dir: /tmp
     - _ce_provision:

diff --git a/docker-images/controller/provision-2.yml b/docker-images/controller/provision-2.yml
@@ -3,8 +3,6 @@
   become: true
   vars:
     - _domain_name: example.com
-    - _ce_provision_base_dir: /home/ce-dev/ce-provision-2
-    - _ce_provision_build_dir: /home/ce-dev/ce-provision-2/ce-dev/ansible/local
     - _ce_provision_build_tmp_dir: /tmp
     - _ce_provision_data_dir: /tmp
     - _ce_provision:

diff --git a/templates/drupal10/ce-dev/ansible/provision.yml.j2 b/templates/drupal10/ce-dev/ansible/provision.yml.j2
@@ -3,15 +3,15 @@
   vars:
     - _domain_name: www.{{ project_name }}.local
     - _env_type: dev
-    - _ce_provision_base_dir: /home/ce-dev/ce-provision-2
-    - _ce_provision_build_dir: /home/ce-dev/ce-provision-2/ce-dev/ansible/local
     - project_name: {{ project_name }}
     - rkhunter:
         allow_ssh_root_user: prohibit-password
     - mysql_client:
         host: {{ project_name }}-db
         user: root
         password: ce-dev
+    - ce_provision:
+        local_dir: /home/ce-dev/ce-provision-2
   {% raw %}
     - nginx:
         domains: