Merge branch 'unstable' into stable

CHANGELOG.md

@@ -18,6 +18,16 @@ The **patch** part changes incrementally at each release.
 
 ### Security
 
+## [9.1.8] - 2018-04-16
+
+### Changed
+* packweb-apache: use dependencies instead of include_role for apache and php roles
+
+### Fixed
+* mysql: use check_mode for apg command (Fix --check)
+* mysql/mysql-oracle: properly reload systemd
+* packweb-apache: use check_mode for apg command (Fix --check)
+
 ## [9.1.7] - 2018-04-06
 
 ### Added

evomaintenance/templates/evomaintenance.j2

@@ -1,13 +1,13 @@
-HOSTNAME="{{ evomaintenance_hostname }}"
-EVOMAINTMAIL="{{ evomaintenance_alert_email or general_alert_email | mandatory }}"
+HOSTNAME={{ evomaintenance_hostname }}
+EVOMAINTMAIL={{ evomaintenance_alert_email or general_alert_email | mandatory }}
 
-export PGPASSWORD="{{ evomaintenance_pg_passwd }}"
+export PGPASSWORD={{ evomaintenance_pg_passwd }}
 
-PGDB="{{ evomaintenance_pg_db }}"
-PGTABLE="{{ evomaintenance_pg_table }}"
-PGHOST="{{ evomaintenance_pg_host }}"
-FROM="{{ evomaintenance_from }}"
+PGDB={{ evomaintenance_pg_db }}
+PGTABLE={{ evomaintenance_pg_table }}
+PGHOST={{ evomaintenance_pg_host }}
+FROM={{ evomaintenance_from }}
 FULLFROM="{{ evomaintenance_full_from }}"
-URGENCYFROM="{{ evomaintenance_urgency_from }}"
+URGENCYFROM={{ evomaintenance_urgency_from }}
 URGENCYTEL="{{ evomaintenance_urgency_tel }}"
 REALM="{{ evomaintenance_realm }}"

mysql-oracle/handlers/main.yml

@@ -15,7 +15,8 @@
     state: restarted
 
 - name: reload systemd
-  command: systemctl daemon-reload
+  systemd:
+    daemon_reload: yes
 
 - name: Restart minifirewall
   command: /etc/init.d/minifirewall restart

mysql/handlers/main.yml

@@ -15,5 +15,5 @@
     state: restarted
 
 - name: reload systemd
-  command: systemctl daemon-reload
-
+  systemd:
+    daemon_reload: yes

mysql/tasks/config_stretch.yml

@@ -35,4 +35,9 @@
     src: mariadb.systemd.j2
     dest: /etc/systemd/system/mariadb.service.d/evolinux.conf
     force: yes
-  notify: reload systemd
+  register: mariadb_systemd_override
+
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+  when: mariadb_systemd_override.changed

mysql/tasks/users_stretch.yml

@@ -13,6 +13,7 @@
   command: "apg -n 1 -m 16 -M lcN"
   register: mysql_admin_password
   changed_when: False
+  check_mode: False
   tags:
   - mysql
 
@@ -48,6 +49,7 @@
   command: "apg -n 1 -m 16 -M lcN"
   register: mysql_debian_password
   changed_when: False
+  check_mode: False
   tags:
   - mysql
 

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

packweb-apache/tasks/phpmyadmin.yml

@@ -26,6 +26,7 @@
 - name: generate random string for phpmyadmin suffix
   command: "apg -a 1 -M N -n 1"
   changed_when: False
+  check_mode: False
   register: _random_phpmyadmin_suffix
 
 - name: overwrite packweb_phpmyadmin_suffix