From faeb92230b679151cf0474756f19db63064191a9 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Sun, 6 Nov 2022 15:24:54 +0100
Subject: [PATCH] packweb-apache: manual dependencies resolution

---
 CHANGELOG.md                          |  1 +
 packweb-apache/meta/main.yml          | 17 +-----
 packweb-apache/tasks/dependencies.yml | 80 +++++++++++++++++++++++++++
 packweb-apache/tasks/main.yml         |  3 +
 4 files changed, 86 insertions(+), 15 deletions(-)
 create mode 100644 packweb-apache/tasks/dependencies.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdcbe65e..b9642581 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * lxc-solr: download URL according to Solr Version
 * lxc-solr: set homedir and port at install
 * minifirewall: whitelist deb.freexian.com
+* packweb-apache: manual dependencies resolution
 * redis: some values should be quoted
 * redis: variable to disable transparent hugepage (default: do nothing)
 * squid: whitelist deb.freexian.com
diff --git a/packweb-apache/meta/main.yml b/packweb-apache/meta/main.yml
index bbf086ce..47d29159 100644
--- a/packweb-apache/meta/main.yml
+++ b/packweb-apache/meta/main.yml
@@ -26,18 +26,5 @@ galaxy_info:
 
 allow_duplicates: true
 
-dependencies:
-  - { role: evolix/apache }
-  - { role: evolix/php, php_apache_enable: True, when: packweb_apache_modphp }
-  - { role: evolix/php, php_fpm_enable: True, when: packweb_apache_fpm }
-  - { role: evolix/squid, squid_localproxy_enable: True }
-  - { role: evolix/mysql,        when: packweb_mysql_variant == "debian" }
-  - { role: evolix/mysql-oracle, when: packweb_mysql_variant == "oracle" }
-  - { role: evolix/lxc-php, lxc_php_version: php56, lxc_php_create_mysql_link: True, when: "'php56' in packweb_multiphp_versions" }
-  - { role: evolix/lxc-php, lxc_php_version: php70, lxc_php_create_mysql_link: True, when: "'php70' in packweb_multiphp_versions" }
-  - { role: evolix/lxc-php, lxc_php_version: php73, lxc_php_create_mysql_link: True, when: "'php73' in packweb_multiphp_versions" }
-  - { role: evolix/lxc-php, lxc_php_version: php74, lxc_php_create_mysql_link: True, when: "'php74' in packweb_multiphp_versions" }
-  - { role: evolix/lxc-php, lxc_php_version: php80, lxc_php_create_mysql_link: True, when: "'php80' in packweb_multiphp_versions" }
-  - { role: evolix/lxc-php, lxc_php_version: php81, lxc_php_create_mysql_link: True, when: "'php81' in packweb_multiphp_versions" }
-  - { role: evolix/webapps/evoadmin-web, evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}", evoadmin_multiphp_versions: "{{ packweb_multiphp_versions }}" }
-  - { role: evolix/evoacme }
+dependencies: []
+
diff --git a/packweb-apache/tasks/dependencies.yml b/packweb-apache/tasks/dependencies.yml
new file mode 100644
index 00000000..0182654c
--- /dev/null
+++ b/packweb-apache/tasks/dependencies.yml
@@ -0,0 +1,80 @@
+---
+
+- import_role:
+    name: evolix/apache
+
+- import_role:
+    name: evolix/php
+  vars:
+    php_apache_enable: True
+  when: packweb_apache_modphp
+
+- import_role:
+    name: evolix/php
+  vars:
+    php_fpm_enable: True
+  when: packweb_apache_fpm
+
+- import_role:
+    name: evolix/squid
+  vars:
+    squid_localproxy_enable: True
+
+- import_role:
+    name: evolix/mysql
+  when: packweb_mysql_variant == "debian"
+
+- import_role:
+    name: evolix/mysql-oracle
+  when: packweb_mysql_variant == "oracle"
+
+- import_role:
+    name: evolix/lxc-php
+  vars:
+    lxc_php_version: php56
+    lxc_php_create_mysql_link: True
+  when: "'php56' in packweb_multiphp_versions"
+
+- import_role:
+    name: evolix/lxc-php
+  vars:
+    lxc_php_version: php70
+    lxc_php_create_mysql_link: True
+  when: "'php70' in packweb_multiphp_versions"
+
+- import_role:
+    name: evolix/lxc-php
+  vars:
+    lxc_php_version: php73
+    lxc_php_create_mysql_link: True
+  when: "'php73' in packweb_multiphp_versions"
+
+- import_role:
+    name: evolix/lxc-php
+  vars:
+    lxc_php_version: php74
+    lxc_php_create_mysql_link: True
+  when: "'php74' in packweb_multiphp_versions"
+
+- import_role:
+    name: evolix/lxc-php
+  vars:
+    lxc_php_version: php80
+    lxc_php_create_mysql_link: True
+  when: "'php80' in packweb_multiphp_versions"
+
+- import_role:
+    name: evolix/lxc-php
+  vars:
+    lxc_php_version: php81
+    lxc_php_create_mysql_link: True
+  when: "'php81' in packweb_multiphp_versions"
+
+- import_role:
+    name: evolix/webapps/evoadmin-web
+  vars:
+    evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}"
+    evoadmin_multiphp_versions: "{{ packweb_multiphp_versions }}"
+
+- import_role:
+    name: evolix/evoacme
\ No newline at end of file
diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml
index 5e2f9e92..ff3cd9a7 100644
--- a/packweb-apache/tasks/main.yml
+++ b/packweb-apache/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
 
+- name: Dependencies are satisfied
+  include_tasks: dependencies.yml
+
 - fail:
     msg: only compatible with Debian >= 8
   when: