packweb-apache: use dependencies instead of include_role for apache and php roles

CHANGELOG.md

@@ -50,6 +50,7 @@ The **patch** part changes incrementally at each release.
 * php: fix FPM custom file permissions
 * php: more tasks notify FPM handler to restart if needed
 * webapps/evoadmin-web: Fail if variable evoadmin_contact_email isn't defined
+* packweb-apache: use dependencies instead of include_role for apache and php roles
 
 ### Fixed
 * dovecot: fix support of plus sign

packweb-apache/meta/main.yml

@@ -15,6 +15,9 @@ galaxy_info:
     - stretch
 
 dependencies:
+  - { role: apache }
+  - { role: php, php_apache_enable: True, when: packweb_apache_modphp }
+  - { role: php, php_fpm_enable: True, when: packweb_apache_fpm }
   - { role: squid, squid_localproxy_enable: True }
   - { role: mysql,        when: packweb_mysql_variant == "debian" }
   - { role: mysql-oracle, when: packweb_mysql_variant == "oracle" }

packweb-apache/tasks/main.yml

@@ -5,24 +5,6 @@
   when:
   - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<')
 
-- name: Include apache role
-  include_role:
-    name: apache
-
-- name: Include PHP role
-  include_role:
-    name: php
-  vars:
-    php_apache_enable: True
-  when: packweb_apache_modphp
-
-- name: Include PHP role
-  include_role:
-    name: php
-  vars:
-    php_fpm_enable: True
-  when: packweb_apache_fpm
-
 - name: install info.php
   copy:
     src: info.php