whitespaces

packweb-apache/tasks/apache.yml

@@ -21,19 +21,19 @@
     name: '{{ item }}'
     state: present
   with_items:
-  - libapache2-mod-security2
+    - libapache2-mod-security2
-  - modsecurity-crs
+    - modsecurity-crs
-  - apg
+    - apg
 
 - name: Additional modules are enabled
   apache2_module:
     name: '{{ item }}'
     state: present
   with_items:
-  - ssl
+    - ssl
-  - include
+    - include
-  - negotiation
+    - negotiation
-  - alias
+    - alias
 
 - name: Copy Apache settings for modules
   copy:
@@ -58,6 +58,5 @@
   register: command_result
   changed_when: "'Enabling' in command_result.stderr"
   with_items:
-  - evolinux-evasive
+    - evolinux-evasive
-  - evolinux-modsec
+    - evolinux-modsec
-

packweb-apache/tasks/fhs_retrictions.yml

@@ -6,23 +6,23 @@
   changed_when: "'changed' in command_result.stdout"
   failed_when: False
   with_items:
-  - /
+    - /
-  - /etc
+    - /etc
-  - /usr
+    - /usr
-  - /usr/bin
+    - /usr/bin
-  - /var
+    - /var
-  - /var/log
+    - /var/log
-  - /home
+    - /home
-  - /bin
+    - /bin
-  - /sbin
+    - /sbin
-  - /lib
+    - /lib
-  - /usr/lib
+    - /usr/lib
-  - /usr/include
+    - /usr/include
-  - /usr/bin
+    - /usr/bin
-  - /usr/sbin
+    - /usr/sbin
-  - /usr/share
+    - /usr/share
-  - /usr/share/doc
+    - /usr/share/doc
-  - /etc/default
+    - /etc/default
 
 - name: Set 750 permission on some folders (/var/log/apt, /var/log/munin, ...)
   shell: "test -d {{ item }} && chmod --verbose 750 {{ item }}"
@@ -30,15 +30,15 @@
   changed_when: "'changed' in command_result.stdout"
   failed_when: False
   with_items:
-  - /var/log/apt
+    - /var/log/apt
-  - /var/lib/dpkg
+    - /var/lib/dpkg
-  - /var/log/munin
+    - /var/log/munin
-  - /var/backups
+    - /var/backups
-  - /etc/init.d
+    - /etc/init.d
-  - /etc/apache2
+    - /etc/apache2
-  - /etc/network
+    - /etc/network
-  - /etc/phpmyadmin
+    - /etc/phpmyadmin
-  - /var/log/installer
+    - /var/log/installer
 
 - name: Change group to www-data for /etc/phpmyadmin/
   file:
@@ -51,11 +51,11 @@
   changed_when: "'changed' in command_result.stdout"
   failed_when: False
   with_items:
-  - /bin/ping
+    - /bin/ping
-  - /bin/ping6
+    - /bin/ping6
-  - /usr/bin/fping
+    - /usr/bin/fping
-  - /usr/bin/fping6
+    - /usr/bin/fping6
-  - /usr/bin/mtr
+    - /usr/bin/mtr
 
 - name: Set 640 permission on some files (/var/log/evolix.log, ...)
   shell: "test -f {{ item }} && chmod --verbose 640 {{ item }}"
@@ -63,6 +63,5 @@
   changed_when: "'changed' in command_result.stdout"
   failed_when: False
   with_items:
-  - /var/log/evolix.log
+    - /var/log/evolix.log
-  - /etc/warnquota.conf
+    - /etc/warnquota.conf
-

packweb-apache/tasks/main.yml

@@ -65,7 +65,7 @@
 
 - include: apache.yml
 
-- include: phpmyadmin.yml
+# - include: phpmyadmin.yml
 
 - include: awstats.yml
 

packweb-apache/tasks/phpmyadmin.yml

@@ -5,8 +5,8 @@
     name: '{{ item }}'
     state: present
   with_items:
-  - phpmyadmin
+    - phpmyadmin
-  - apg
+    - apg
 
 - name: Check if phpmyadmin default configuration is present
   stat:

webapps/evoadmin-web/tasks/packages.yml

@@ -4,19 +4,28 @@
     name: apt
     tasks_from: evolix_public.yml
 
-- name: Install PHP packages
+- name: Install PHP packages (Debian 10 and later)
   apt:
     name: '{{ item }}'
     state: present
   with_items:
-  - php-pear
+    - php-pear
-  - php-log
+  when: ansible_distribution_major_version | version_compare('10', '>=')
 
-- name: Install PHP5 packages
+- name: Install PHP packages (stretch)
+  apt:
+    name: '{{ item }}'
+    state: present
+  with_items:
+    - php-pear
+    - php-log
+  when: ansible_lsb.codename == "stretch"
+
+- name: Install PHP5 packages (jessie)
   apt:
     name: '{{ item }}'
     state: present
     allow_unauthenticated: yes
   with_items:
-  - php5-pam
+    - php5-pam
   when: ansible_lsb.codename == "jessie"