Update to 2020-11-09 09:00

roles/common/defaults/main.yml

@@ -16,7 +16,6 @@ system_utils:
   - bzip2
   - pbzip2
   - lzop
-  - zstd
   - vim
   - bash-completion
   - rsync
@@ -35,25 +34,6 @@ system_utils:
   - tree
   - mc
 
-# List specific for EL based
-system_utils_el:
-  - openssh-clients
-  - nc
-  - xz
-  - lz4
-  - yum-utils
-  - fuse-sshfs
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('policycoreutils-python','python3-policycoreutils') }}"
-
-# List specific for Debian based
-system_utils_deb:
-  - apt-transport-https
-  - openssh-client
-  - netcat
-  - xz-utils
-  - liblz4-tool
-  - sshfs
-
 # Kernel modules to load
 system_kmods: []
 

roles/common/tasks/main.yml

@@ -1,5 +1,12 @@
 ---
 
+- include_vars: "{{ item }}"
+  with_first_found:
+    - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml
+    - vars/{{ ansible_distribution }}.yml
+    - vars/{{ ansible_os_family }}.yml
+    - vars/defaults.yml
+
 - include_tasks: utils.yml
 - include_tasks: hostname.yml
 - include_tasks: tz.yml

roles/common/tasks/utils.yml

@@ -1,29 +1,12 @@
 ---
 
 - name: Install common utilities
-  yum:
-    name: "{{ system_utils }} + {{ system_utils_el }}"
-  when: ansible_os_family == 'RedHat'
-
-- name: Strip unsupported packages
-  set_fact: system_utils={{ system_utils | difference(['zstd']) }}
-  when: ansible_distribution == 'Debian' and ansible_distribution_major_version is version('9', '<')
-
-- name: Install common utilities
-  apt:
-    name: "{{ system_utils }} + {{ system_utils_deb }}"
-    update_cache: True
-  when: ansible_os_family == 'Debian'
-
-- name: Install extra softwares
-  yum:
-    name: "{{ system_extra_pkgs }}"
-  when: ansible_os_family == 'RedHat'
+  package:
+    name: "{{ system_utils + system_distro_utils}}"
 
 - name: Install extra softwares
-  apt:
+  package:
     name: "{{ system_extra_pkgs }}"
-  when: ansible_os_family == 'Debian'
 
   # Screendump is not used, and prevent using tab to use screen quickly, so remove it
 - name: Check if screendump is present

roles/common/vars/CentOS-7.yml

@@ -0,0 +1,13 @@
+---
+
+system_distro_utils:
+  - openssh-clients
+  - nc
+  - xz
+  - lz4
+  - yum-utils
+  - fuse-sshfs
+  - policycoreutils-python
+  - MySQL-python
+  - python-psycopg2
+  - zstd

roles/common/vars/CentOS-8.yml

@@ -0,0 +1,13 @@
+---
+
+system_distro_utils:
+  - openssh-clients
+  - nc
+  - xz
+  - lz4
+  - yum-utils
+  - fuse-sshfs
+  - python3-policycoreutils
+  - python3-mysql
+  - python3-psycopg2
+  - zstd

roles/common/vars/Debian-10.yml

@@ -0,0 +1,10 @@
+---
+
+system_distro_utils:
+  - apt-transport-https
+  - openssh-client
+  - netcat
+  - xz-utils
+  - liblz4-tool
+  - sshfs
+  - zstd

roles/common/vars/Debian-9.yml

@@ -0,0 +1,9 @@
+---
+
+system_distro_utils:
+  - apt-transport-https
+  - openssh-client
+  - netcat
+  - xz-utils
+  - liblz4-tool
+  - sshfs

roles/glpi/meta/main.yml

@@ -2,4 +2,7 @@
 allow_duplicates: true
 dependencies:
   - role: mkdir
+  - role: httpd_php
+  - role: mysql_server
+    when: glpi_mysql_server == 'localhost' or glpi_mysql_server == '127.0.0.1'
 ...

roles/glpi/tasks/conf.yml

@@ -21,7 +21,7 @@
   tags: glpi
 
 - name: Upgrade database
-  command: "/bin/php{{ (glpi_php_version == '54') | ternary('',glpi_php_version) }} {{ glpi_root_dir }}/web/bin/console -n db:update"
+  command: "/bin/php{{ glpi_php_version }} {{ glpi_root_dir }}/web/bin/console -n db:update"
   when: glpi_install_mode == 'upgrade'
   tags: glpi
 

roles/glpi/tasks/install.yml

@@ -4,7 +4,6 @@
   yum:
     name:
       - unzip
-      - MySQL-python
       - tar
       - bzip2
       - acl

roles/system_proxy/tasks/main.yml

@@ -51,6 +51,18 @@
   when: ansible_os_family == 'RedHat'
   tags: proxy
 
+- name: Configure proxy for dnf
+  ini_file:
+    path: /etc/dnf/yum.conf
+    section: main
+    option: proxy
+    value: "{{ (system_proxy is defined and system_proxy != '') | ternary(system_proxy,'') }}"
+    state: "{{ (system_proxy is defined and system_proxy != '') | ternary('present','absent') }}"
+  when:
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution_major_version is version('8', '>=')
+  tags: proxy
+
 - name: Config proxy for apt
   copy:
     content: |

roles/ttrss/defaults/main.yml

@@ -28,5 +28,5 @@ ttrss_php_version: 74
 #   - 10.32.0.0/16
 #   - 192.168.1.0/24
 
-# Public URL to access Tiny Tiny RSS, must be set
-# ttrss_public_url: https://rss.example.org/
+# Public URL to access Tiny Tiny RSS
+ttrss_public_url: https://{{ inventory_hostname }}/

roles/ttrss/tasks/main.yml

@@ -1,17 +1,20 @@
 ---
 
+- include_vars: "{{ item }}"
+  with_first_found:
+    - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml
+    - vars/{{ ansible_distribution }}.yml
+    - vars/{{ ansible_os_family }}.yml
+    - vars/defaults.yml
+
 - name: Set default install mode
   set_fact: ttrss_install_mode='none'
 
 - name: Set php executable
-  set_fact: ttrss_php_bin=/usr/bin/php{{ (ttrss_php_version == '54') | ternary('',ttrss_php_version) }}
+  set_fact: ttrss_php_bin=/usr/bin/php{{ ttrss_php_version }}
 
 - name: Install packages
-  yum:
-    name:
-      - git
-      - MySQL-python
-      - mariadb
+  yum: name={{ ttrss_packages }}
 
 - name: Create user account for PHP
   user:
@@ -110,16 +113,16 @@
   notify: reload httpd
 
 - name: Deploy PHP configuration
-  template: src=php.conf.j2 dest={{ httpd_php_versions[ttrss_php_version].conf_path }}/php-fpm.d/ttrss_{{ ttrss_id }}.conf
+  template: src=php.conf.j2 dest=/etc/opt/remi/php{{ ttrss_php_version }}/php-fpm.d/ttrss_{{ ttrss_id }}.conf
   notify: restart php-fpm
 
 - name: Remove PHP configuration from other versions
-  file: path={{ httpd_php_versions[item].conf_path }}/php-fpm.d/ttrss_{{ ttrss_id }}.conf state=absent
-  with_items: "{{ httpd_php_versions.keys() | list | difference([ ttrss_php_version ]) }}"
+  file: path=/etc/opt/remi/php{{ item }}/php-fpm.d/ttrss_{{ ttrss_id }}.conf state=absent
+  with_items: "{{ httpd_php_versions | difference([ ttrss_php_version ]) }}"
   notify: restart php-fpm
 
 - name: Remove PHP configuration (using a custom pool)
-  file: path={{ httpd_php_versions[ttrss_php_version].conf_path }}/php-fpm.d/ttrss_{{ ttrss_id }}.conf state=absent
+  file: path=/etc/opt/remi/php{{ ttrss_php_version }}/php-fpm.d/ttrss_{{ ttrss_id }}.conf state=absent
   when: ttrss_php_fpm_pool is defined
   notify: restart php-fpm
 

roles/ttrss/vars/CentOS-7.yml

@@ -0,0 +1,6 @@
+---
+
+ttrss_packages:
+  - git
+  - MySQL-python
+  - mariadb

roles/ttrss/vars/CentOS-8.yml

@@ -0,0 +1,6 @@
+---
+
+ttrss_packages:
+  - git
+  - python3-mysql
+  - mariadb