tasks/main.yml

@@ -31,7 +31,7 @@
 - name: www index.html
   shell: "test -e /var/www/def/public/index.html || hostname > /var/www/def/public/index.html"
 
-- name: install packages, debian8
+- name: install packages, jessie
   tags: apt
   apt:
     name:
@@ -49,7 +49,7 @@
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version == "8"
 
-- name: install packages, debian9-10
+- name: install packages, stretch-buster
   tags: apt
   apt:
     name:
@@ -72,14 +72,14 @@
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version|int() == 9 or ansible_distribution_major_version|int() == 10
 
-- name: sury repo pgp key, debian11-99
+- name: sury repo pgp key, bullseye+
   tags: apt
   shell: "curl {{ (proxy is defined) | ternary('--proxy '+ proxy|default(''), '')}} -o /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg"
   when:
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version|int() >= 11
 
-- name: sury repo in sources list, debian11
+- name: sury repo in sources list, bullseye
   tags: apt
   lineinfile:
     dest: /etc/apt/sources.list.d/php-sury.list
@@ -89,7 +89,7 @@
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version|int() == 11
 
-- name: sury repo in sources list, debian12
+- name: sury repo in sources list, bookworm
   tags: apt
   lineinfile:
     dest: /etc/apt/sources.list.d/php-sury.list
@@ -97,9 +97,9 @@
     create: yes
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version|int() == 12
+    - ansible_distribution_major_version|int() >= 12
 
-- name: apt update, debian11-99
+- name: apt update, bullseye+
   tags: apt
   apt:
     update_cache: yes
@@ -107,38 +107,21 @@
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version|int() >= 11
 
-- name: set phpver for debian11 ubuntu20
+- name: set phpver for debian bullseye
   set_fact:
     phpver: "7.4"
   when:
-    - ansible_distribution == "Debian"
+    - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() == 11) or
-    - ansible_distribution_major_version|int() == 12
+      (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() >= 20)
 
-- name: set phpver for debian debian12
+- name: set phpver for debian bookworm+
   set_fact:
     phpver: "8.2"
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version|int() == 12
+    - ansible_distribution_major_version|int() >= 12
 
-- name: set phpver for ubuntu20
+- name: install packages, bullseye+
-  set_fact:
-    phpver: "7.4"
-    # default, ubuntuba nem teszunk sury repot
-  when:
-    - ansible_distribution == "Ubuntu"
-    - ansible_distribution_major_version|int() == 20
-
-- name: set phpver for debian ubuntu22
-  set_fact:
-    phpver: "8.1"
-    # default, ubuntuba nem teszunk sury repot
-  when:
-    - ansible_distribution == "Ubuntu"
-    - ansible_distribution_major_version|int() == 22
-
-
-- name: install packages [phpver]
   tags: apt
   apt:
     name:
@@ -163,7 +146,7 @@
   when:
     - phpver is defined
 
-- name: install json for php7.4 [phpver]
+- name: install packages, bullseye+
   tags: apt
   apt:
     name:
@@ -173,7 +156,7 @@
     - phpver is defined
     - phpver == "7.4"
 
-- name: php fpm/pool.d/www.conf [phpver]
+- name: php fpm/pool.d/www.conf, bullseye+
   template:
     src: pool_www.conf
     dest: "/etc/php/{{ phpver }}/fpm/pool.d/www.conf"
@@ -189,19 +172,19 @@
     - charset.conf
     - log-detailed.conf
 
-- name: enable confs / modules, debian0-10
+- name: enable confs / modules, -buster
   shell: "a2enconf charset log-detailed && a2enmod rewrite"
   when: 
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version|int() < 11
 
-- name: enable confs / modules, debian11-99 ubuntu20-99
+- name: enable confs / modules, bullseye+
   shell: "a2enconf charset log-detailed && a2enmod rewrite headers proxy_fcgi"
   when: 
     - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() >= 11) or
       (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() >= 20)
 
-- name: virtualhost config, debian0-10
+- name: virtualhost config, -buster
   copy:
     src: 000-default_modphp.conf
     dest: /etc/apache2/sites-available/000-default.conf
@@ -209,7 +192,7 @@
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version|int() < 11
 
-- name: virtualhost config, debian11-99 ubuntu20-99
+- name: virtualhost config, bullseye+
   template:
     src: 000-default_fpm.conf
     dest: /etc/apache2/sites-available/000-default.conf
@@ -217,7 +200,7 @@
     - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() >= 11) or
       (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() >= 20)
 
-- name: php config, debian8
+- name: php config, jessie
   copy:
     src: hws.php.ini.modphp
     dest: /etc/php5
@@ -225,7 +208,7 @@
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version == "8"
 
-- name: php config symlinks, debian8
+- name: php config symlinks, jessie
   file:
     state: link
     src: /etc/php5/hws.php.ini
@@ -237,7 +220,7 @@
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version == "8"
 
-- name: php config, debian9
+- name: php config, stretch
   copy:
     src: hws.php.ini.modphp
     dest: /etc/php/7.0/hws.php.ini
@@ -245,7 +228,7 @@
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version == "9"
 
-- name: php config, debian10
+- name: php config, buster
   copy:
     src: hws.php.ini.modphp
     dest: /etc/php/7.3/hws.php.ini
@@ -261,7 +244,7 @@
 #    - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() == 11) or
 #      (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() >= 20)
 
-- name: php config symlinks, debian9
+- name: php config symlinks, stretch
   file:
     state: link
     src: /etc/php/7.0/hws.php.ini
@@ -273,7 +256,7 @@
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version == "9"
 
-- name: php config symlinks, debian10
+- name: php config symlinks, buster
   file:
     state: link
     src: /etc/php/7.3/hws.php.ini
@@ -303,7 +286,7 @@
     src: logrotate.conf
     dest: /etc/logrotate.d/php
 
-- name: security.conf ServerTokens, debian11-99 ubuntu20-99
+- name: security.conf ServerTokens, bullseye+
   tags: apt
   lineinfile:
     dest: /etc/apache2/conf-available/security.conf
@@ -314,7 +297,7 @@
       (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() >= 20)
 
 
-- name: security.conf ServerSignature, debian11-99 ubuntu20-99
+- name: security.conf ServerSignature, bullseye+
   tags: apt
   lineinfile:
     dest: /etc/apache2/conf-available/security.conf