Merge pull request #251 from devilbox/release-0.144

Release 0.144
devilbox · Dec 1, 2022 · 8d305b3 · 8d305b3
2 parents cb046dd + 9c4490f
commit 8d305b3
Show file tree

Hide file tree

Showing 527 changed files with 13,916 additions and 3,429 deletions.
diff --git a/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 → .ansible/CONFIGURATIONS/php-fpm.conf.j2 b/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 → .ansible/CONFIGURATIONS/php-fpm.conf.j2
diff --git a/build/ansible/CONFIGURATIONS/php.ini.j2 → .ansible/CONFIGURATIONS/php.ini.j2 b/build/ansible/CONFIGURATIONS/php.ini.j2 → .ansible/CONFIGURATIONS/php.ini.j2
diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 → .ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 → .ansible/DOCKERFILES/Dockerfile-base.j2
diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 → .ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 → .ansible/DOCKERFILES/Dockerfile-mods.j2
diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 → .ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 → .ansible/DOCKERFILES/Dockerfile-prod.j2
diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 → .ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 → .ansible/DOCKERFILES/Dockerfile-work.j2
diff --git a/build/ansible/README.md → .ansible/README.md b/build/ansible/README.md → .ansible/README.md
diff --git a/build/ansible/ansible.cfg → .ansible/ansible.cfg b/build/ansible/ansible.cfg → .ansible/ansible.cfg
@@ -1,3 +1,3 @@
 [defaults]
 roles_path = ./roles
-inventory = inventory
+inventory = inventory.ini
diff --git a/build/ansible/generate.yml → .ansible/generate.yml b/build/ansible/generate.yml → .ansible/generate.yml
diff --git a/build/ansible/group_vars/all/all-ansible.yml → .ansible/group_vars/all/all-ansible.yml b/build/ansible/group_vars/all/all-ansible.yml → .ansible/group_vars/all/all-ansible.yml
@@ -3,10 +3,10 @@
 # Ansible specific definitions
 ###################################################################################################
 
-edit_comment_base: "# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead."
-edit_comment_mods: "# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-mods.j2 instead."
-edit_comment_prod: "# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-prod.j2 instead."
-edit_comment_work: "# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-work.j2 instead."
+edit_comment_base: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-base.j2 instead."
+edit_comment_mods: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-mods.j2 instead."
+edit_comment_prod: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-prod.j2 instead."
+edit_comment_work: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-work.j2 instead."
 
 
 # -------------------------------------------------------------------------------------------------
@@ -42,13 +42,13 @@ php_all_versions:
 # -------------------------------------------------------------------------------------------------
 template_dockerfiles:
   - src: DOCKERFILES/Dockerfile-base.j2
-    dst: "../../Dockerfiles/base/Dockerfile-{{ php_version }}"
+    dst: "../Dockerfiles/base/Dockerfile-{{ php_version }}"
   - src: DOCKERFILES/Dockerfile-mods.j2
-    dst: "../../Dockerfiles/mods/Dockerfile-{{ php_version }}"
+    dst: "../Dockerfiles/mods/Dockerfile-{{ php_version }}"
   - src: DOCKERFILES/Dockerfile-prod.j2
-    dst: "../../Dockerfiles/prod/Dockerfile-{{ php_version }}"
+    dst: "../Dockerfiles/prod/Dockerfile-{{ php_version }}"
   - src: DOCKERFILES/Dockerfile-work.j2
-    dst: "../../Dockerfiles/work/Dockerfile-{{ php_version }}"
+    dst: "../Dockerfiles/work/Dockerfile-{{ php_version }}"
 
 
 # -------------------------------------------------------------------------------------------------
@@ -57,23 +57,23 @@ template_dockerfiles:
 template_configurations:
   # php.ini
   - src: CONFIGURATIONS/php.ini.j2
-    dst: "../../Dockerfiles/base/data/php-ini.d/php-{{ php_version }}.ini"
+    dst: "../Dockerfiles/base/data/php-ini.d/php-{{ php_version }}.ini"
     cfg: "{{ php_settings_ini }}"
     key: base
     alt: base
   - src: CONFIGURATIONS/php.ini.j2
-    dst: "../../Dockerfiles/work/data/php-ini.d/php-{{ php_version }}.ini"
+    dst: "../Dockerfiles/work/data/php-ini.d/php-{{ php_version }}.ini"
     cfg: "{{ php_settings_ini }}"
     key: work
     alt: base  # Alternative key to use when definition is not set in 'work'
   # php-fpm.conf
   - src: CONFIGURATIONS/php-fpm.conf.j2
-    dst: "../../Dockerfiles/base/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
+    dst: "../Dockerfiles/base/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
     cfg: "{{ php_settings_fpm }}"
     key: base
     alt: base
   - src: CONFIGURATIONS/php-fpm.conf.j2
-    dst: "../../Dockerfiles/work/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
+    dst: "../Dockerfiles/work/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
     cfg: "{{ php_settings_fpm }}"
     key: work
     alt: base
diff --git a/...sible/group_vars/all/all-php-settings.yml → .ansible/group_vars/all/all-php-settings.yml b/...sible/group_vars/all/all-php-settings.yml → .ansible/group_vars/all/all-php-settings.yml