OS updates

.github/workflows/fedora-38.yml → .github/workflows/fedora-40.yml

@@ -1,5 +1,5 @@
 ---
-name: Fedora 38
+name: Fedora 40
 
 on: # yamllint disable-line rule:truthy
   push:
@@ -18,7 +18,7 @@ jobs:
       - name: Test Galaxy role
         run: >
             CONT_ID=$(podman run --rm -v ${{ github.workspace }}:/repo -v /sys/fs/cgroup:/sys/fs/cgroup:ro
-            --tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:38) &&
+            --tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:40) &&
             podman exec ${CONT_ID} /bin/bash -c
             "if [ -f requirements.yml ]; then ansible-galaxy role install --force -r requirements.yml -p ..; fi &&
             ANSIBLE_ROLES_PATH=.. ANSIBLE_FORCE_COLOR=true ansible-playbook tests/main.yml" &&

.github/workflows/fedora-39.yml → .github/workflows/fedora-41.yml

@@ -1,5 +1,5 @@
 ---
-name: Fedora 39
+name: Fedora 41
 
 on: # yamllint disable-line rule:truthy
   push:
@@ -18,7 +18,7 @@ jobs:
       - name: Test Galaxy role
         run: >
             CONT_ID=$(podman run --rm -v ${{ github.workspace }}:/repo -v /sys/fs/cgroup:/sys/fs/cgroup:ro
-            --tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:39) &&
+            --tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:41) &&
             podman exec ${CONT_ID} /bin/bash -c
             "if [ -f requirements.yml ]; then ansible-galaxy role install --force -r requirements.yml -p ..; fi &&
             ANSIBLE_ROLES_PATH=.. ANSIBLE_FORCE_COLOR=true ansible-playbook tests/main.yml" &&

.github/workflows/ubuntu-18.04.yml → .github/workflows/ubuntu-24.04.yml

@@ -1,5 +1,5 @@
 ---
-name: Ubuntu 18.04
+name: Ubuntu 24.04
 
 on: # yamllint disable-line rule:truthy
   push:
@@ -18,7 +18,7 @@ jobs:
       - name: Test Galaxy role
         run: >
             CONT_ID=$(podman run --rm -v ${{ github.workspace }}:/repo -v /sys/fs/cgroup:/sys/fs/cgroup:ro
-            --tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-ubuntu:18.04) &&
+            --tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-ubuntu:24.04) &&
             podman exec ${CONT_ID} /bin/bash -c
             "if [ -f requirements.yml ]; then ansible-galaxy role install --force -r requirements.yml -p ..; fi &&
             ANSIBLE_ROLES_PATH=.. ANSIBLE_FORCE_COLOR=true ansible-playbook tests/main.yml" &&

tasks/host.yml

@@ -10,7 +10,7 @@
   notify: Reload nginx
 
 - include_tasks: selinux.yml
-  when: ansible_pkg_mgr == 'dnf'
+  when: ansible_os_family == 'RedHat'
 
 - name: "Enable {{ domain }} host"
   file:

tasks/main2.yml

@@ -1,6 +1,6 @@
 ---
 - include_tasks: apt_cache.yml
-  when: ansible_pkg_mgr == 'apt' and noobient_apt_cache_updated is not defined
+  when: ansible_os_family == 'Debian' and noobient_apt_cache_updated is not defined
 
 - include_tasks: wordpress.yml
   when: (noobient_nginx_wp_installed is not defined) and (mode == 'wordpress')

tasks/php.yml

@@ -10,17 +10,17 @@
     cmd: "update-alternatives --query php | grep '^Best' | awk '{print $2}' | xargs basename | sed 's/php//'"
   changed_when: false
   register: noobient_nginx_php_check
-  when: ansible_pkg_mgr == 'apt'
+  when: ansible_os_family == 'Debian'
 
 - set_fact:
     noobient_nginx_php_ver: "{{ noobient_nginx_php_check.stdout_lines[0] }}"
   when: ansible_pkg_mgr == 'apt'
 
 - set_fact:
-    noobient_nginx_php_unit: "php{% if ansible_pkg_mgr == 'apt' %}{{ noobient_nginx_php_ver }}{% endif %}-fpm.service"
-    noobient_nginx_php_ini: "{% if ansible_pkg_mgr == 'dnf' %}/etc/php.ini{% else %}/etc/php/{{ noobient_nginx_php_ver }}/fpm/php.ini{% endif %}"
-    noobient_nginx_fpm_conf: "{% if ansible_pkg_mgr == 'dnf' %}/etc/php-fpm.d/{% else %}/etc/php/{{ noobient_nginx_php_ver }}/fpm/pool.d/{% endif %}www.conf"
-    noobient_nginx_fpm_sock: "{% if ansible_pkg_mgr == 'dnf' %}{{ default_fpm_sock }}{% else %}/run/php/php{{ noobient_nginx_php_ver }}-fpm.sock{% endif %}"
+    noobient_nginx_php_unit: "php{% if ansible_os_family == 'Debian' %}{{ noobient_nginx_php_ver }}{% endif %}-fpm.service"
+    noobient_nginx_php_ini: "{% if ansible_os_family == 'RedHat' %}/etc/php.ini{% else %}/etc/php/{{ noobient_nginx_php_ver }}/fpm/php.ini{% endif %}"
+    noobient_nginx_fpm_conf: "{% if ansible_os_family == 'RedHat' %}/etc/php-fpm.d/{% else %}/etc/php/{{ noobient_nginx_php_ver }}/fpm/pool.d/{% endif %}www.conf"
+    noobient_nginx_fpm_sock: "{% if ansible_os_family == 'RedHat' %}{{ default_fpm_sock }}{% else %}/run/php/php{{ noobient_nginx_php_ver }}-fpm.sock{% endif %}"
 
 - name: Set PHP options
   ini_file:

tasks/wordpress.yml

@@ -12,13 +12,13 @@
       - php-json
       - php-mbstring
       - php-xml
-      - "php{% if ansible_pkg_mgr == 'apt' %}{{ noobient_nginx_php_ver }}{% endif %}-intl"
-      - "php{% if ansible_pkg_mgr == 'dnf' %}-pecl{% else %}{{ noobient_nginx_php_ver }}{% endif %}-zip"
+      - "php{% if ansible_os_family == 'Debian' %}{{ noobient_nginx_php_ver }}{% endif %}-intl"
+      - "php{% if ansible_os_family == 'RedHat' %}-pecl{% else %}{{ noobient_nginx_php_ver }}{% endif %}-zip"
   register: noobient_nginx_wp_installed
 
 # Not available on EL8
 - name: Install ImageMagick PHP extension
   package:
-    name: "php{% if ansible_pkg_mgr == 'dnf' %}-pecl{% else %}{{ noobient_nginx_php_ver }}{% endif %}-imagick"
+    name: "php{% if ansible_os_family == 'RedHat' %}-pecl{% else %}{{ noobient_nginx_php_ver }}{% endif %}-imagick"
     state: latest
   when: not (ansible_distribution_major_version == '8' and ansible_os_family == 'RedHat')

vars/main.yml

@@ -1,6 +1,6 @@
 ---
 nginx_root: /etc/nginx
-nginx_account: "{% if ansible_pkg_mgr == 'dnf' %}nginx{% else %}www-data{% endif %}"
+nginx_account: "{% if ansible_os_family == 'RedHat' %}nginx{% else %}www-data{% endif %}"
 
 eff_path: "{% if path is defined and path | length %}{{ path }}{% else %}/var/www/html/{{ domain }}{% endif %}"
 eff_www_mode: "{% if www_mode is defined and www_mode | length %}{{ www_mode }}{% else %}redirect{% endif %}"