Update to 2022-07-23 12:00

2025-04-12 00:03:17 +02:00 · 2022-07-23 12:00:16 +02:00 · 2022-07-23 12:00:16 +02:00 · 7a53cdbef7
commit 7a53cdbef7
parent 307e1ac20d
12 changed files with 139 additions and 28 deletions
--- a/roles/n8n/defaults/main.yml
+++ b/roles/n8n/defaults/main.yml
@ -1,7 +1,7 @@
 ---

 # Version to deploy
-n8n_version: 0.185.0
+n8n_version: 0.186.1
 # Root directory where n8n will be installed
 n8n_root_dir: /opt/n8n
 # User account under which n8n will run
--- a/roles/postgresql_server/defaults/main.yml
+++ b/roles/postgresql_server/defaults/main.yml
@ -30,6 +30,7 @@ pg_base_conf:
  log_timezone: "{{ system_tz | default('Europe/Paris') }}"
  timezone: "{{ system_tz | default('Europe/Paris') }}"
  log_destination: syslog
+  log_line_prefix: '[%l-1] user=%u,db=%d,app=%a,client=%h '
  datestyle: 'iso, dmy'
  lc_messages: fr_FR.UTF-8
  lc_monetary: fr_FR.UTF-8
--- a/roles/repo_base/tasks/AlmaLinux-9.yml
+++ b/roles/repo_base/tasks/AlmaLinux-9.yml
@ -0,0 +1,34 @@
+---
+
+- name: Configure repositories
+  yum_repository:
+    file: "{{ item.file }}"
+    description: "AlmaLinux {{ item.name }}"
+    name: "{{ item.name }}"
+    baseurl: https://repo.almalinux.org/almalinux/$releasever/{{ item.dir }}/$basearch/os/
+    gpgcheck: True
+    gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+    enabled: "{{ item.enabled | default(True) }}"
+  loop:
+    - name: baseos
+      file: almalinux
+      dir: BaseOS
+    - name: appstream
+      file: almalinux
+      dir: AppStream
+    - name: crb
+      file: almalinux
+      dir: CRB
+    - name: extras
+      file: almalinux
+      dir: extras
+  tags: repo
+
+- include_tasks: epel_{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml
+  tags: always
+
+- include_tasks: dbd_{{ ansible_os_family }}.yml
+  tags: always
+
+- include_tasks: postgres_client_{{ ansible_os_family }}.yml
+  tags: always
--- a/roles/repo_base/tasks/epel_RedHat-9.yml
+++ b/roles/repo_base/tasks/epel_RedHat-9.yml
@ -0,0 +1,12 @@
+---
+
+- name: Configure EPEL repository
+  yum_repository:
+    name: epel
+    description: "Extra Package for Enterprise Linux"
+    baseurl: http://mirrors.ircam.fr/pub/fedora/epel/$releasever/Everything/$basearch http://mir01.syntis.net/epel/$releasever/Everything/$basearch
+    gpgcheck: True
+    gpgkey: https://mir01.syntis.net/epel/RPM-GPG-KEY-EPEL-9
+    exclude: dehydrated
+  tags: repo
+
--- a/roles/repo_postgresql/templates/postgresql.repo.j2
+++ b/roles/repo_postgresql/templates/postgresql.repo.j2
@ -8,10 +8,12 @@ name = PostgreSQL
 # Workaround a bug in dnf which would make the default module mask packages from postgres repo
 module_hotfixes = true
 {% endif %}
+exclude = python3-psycopg2

 [postgresql-common]
 baseurl = https://download.postgresql.org/pub/repos/yum/common/redhat/rhel-$releasever-$basearch
 gpgcheck = 1
 gpgkey = https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
 name = PostgreSQL Common
+exclude = python3-psycopg2
 {% endif %}
--- a/roles/repo_zabbix/tasks/RedHat.yml
+++ b/roles/repo_zabbix/tasks/RedHat.yml
@ -4,34 +4,56 @@
  copy:
    content: |
      -----BEGIN PGP PUBLIC KEY BLOCK-----
-      Version: GnuPG v1.4.10 (GNU/Linux)
      
-      mQENBFeIdv0BCADAzkjO9jHoDRfpJt8XgfsBS8FpANfHF2L29ntRwd8ocDwxXSbt
-      BuGIkUSkOPUTx6i/e9hd8vYh4mcX3yYpiW8Sui4aXbJu9uuSdU5KvPOaTsFeit9j
-      BDK4b0baFYBDpcBBrgQuyviMAVAczu5qlwolA/Vu6DWqah1X9p+4EFa1QitxkhYs
-      3br2ZGy7FZA3f2sZaVhHAPAOBSuQ1W6tiUfTIj/Oc7N+FBjmh3VNfIvMBa0E3rA2
-      JlObxUEywsgGo7FPWnwjZyv883slHp/I3H4Or9VBouTWA2yICeROmMwjr4mOZtJT
-      z9e4v/a2cG/mJXgxCe+FjBvTvrgOVHAXaNwLABEBAAG0IFphYmJpeCBMTEMgPHBh
-      Y2thZ2VyQHphYmJpeC5jb20+iQE4BBMBAgAiBQJXiHb9AhsDBgsJCAcDAgYVCAIJ
-      CgsEFgIDAQIeAQIXgAAKCRAIKrVroU/lkbO8B/4/MhxoUN2RPmH7BzFGIntKEWAw
-      bRkDzyQOk9TjXVegfsBnzmDSdowh7gyteVauvr62jiVtowlE/95vbXqbBCISLqKG
-      i9Wmbrj7lUXBd2sP7eApFzMUhb3G3GuV5pCnRBIzerDfhXiLE9EWRN89JYDxwCLY
-      ctQHieZtdmlnPyCbFF6wcXTHUEHBPqdTa6hvUqQL2lHLFoduqQz4Q47Cz7tZxnbr
-      akAewEToPcjMoteCSfXwF/BRxSUDlN7tKFfBpYQawS8ZtN09ImHOO6CZ/pA0qQim
-      iNiRUfA25onIDWLLY/NMWg+gK94NVVZ7KmFG3upDB5/uefK6Xwu2PsgiXSQguQEN
-      BFeIdv0BCACZgfqgz5YoX+ujVlw1gX1J+ygf10QsUM9GglLEuDiSS/Aa3C2UbgEa
-      +N7JuvzZigGFCvxtAzaerMMDzbliTqtMGJOTjWEVGxWQ3LiY6+NWgmV46AdXik7s
-      UXM155f1vhOzYp6EZj/xtGvyUzTLUkAlnZNrhEUbUmOhDLassVi32hIyMR5W7w6I
-      Ii0zIM1mSuLR0H6oDEpR3GzuGVHGj4/sLeAg7iY5MziGwySBQk0Dg0xH5YqHb+uK
-      zCTH/ILu3srPJq+237Px/PctAZCEA96ogc/DNF2XjdUpMSaEybR0LuHHstAqkrq8
-      AyRtDJNYE+09jDFdUIukhErLuo1YPWqFABEBAAGJAR8EGAECAAkFAleIdv0CGwwA
-      CgkQCCq1a6FP5ZH8+wf/erZneDXqM6xYT8qncFpc1GtOCeODNb19Ii22lDEXd9qN
-      UlAz2SB6zC5oywlnR0o1cglcrW96MD/uuCL/+tTczeB2C455ofs2mhpK7nKiA4FM
-      +JZZ6XSBnq7sfsYD6knbvS//SXQV/qYb4bKMvwYnyMz63escgQhOsTT20ptc/w7f
-      C+YPBR/rHImKspyIwxyqU8EXylFW8f3Ugi2+Fna3CAPR9yQIAChkCjUawUa2VFmm
-      5KP8DHg6oWM5mdqcpvU5DMqpi8SA26DEFvULs8bR+kgDd5AU3I4+ei71GslOdfk4
-      s1soKT4X2UK+dCCXui+/5ZJHakC67t5OgbMas3Hz4Q==
-      =5TOS
+      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
+      E3Cz8i/6R+UcSePUgz5fRnKI+A==
+      =R7+o
      -----END PGP PUBLIC KEY BLOCK-----
    dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-zabbix
  tags: repo,zabbix
--- a/roles/rpm_build_server/tasks/conf.yml
+++ b/roles/rpm_build_server/tasks/conf.yml
@ -6,6 +6,7 @@
    - site-defaults.cfg
    - el7-x86_64.cfg
    - el8-x86_64.cfg
+    - el9-x86_64.cfg
  tags: rpm

 - name: Deploy rpmmacros
--- a/roles/rpm_build_server/tasks/directories.yml
+++ b/roles/rpm_build_server/tasks/directories.yml
@ -12,6 +12,7 @@
    - dir: "{{ rpm_root_dir }}/bin"
    - dir: "{{ rpm_root_dir }}/uploads/el7"
    - dir: "{{ rpm_root_dir }}/uploads/el8"
+    - dir: "{{ rpm_root_dir }}/uploads/el9"
    - dir: "{{ rpm_root_dir }}/errors"
    - dir: "{{ rpm_root_dir }}/builds"
    - dir: "{{ rpm_root_dir }}/etc"
--- a/roles/rpm_build_server/templates/config.yml.j2
+++ b/roles/rpm_build_server/templates/config.yml.j2
@ -5,6 +5,8 @@ targets:
    - x86_64
  el8:
    - x86_64
+  el9:
+    - x86_64

 paths:
  repo: {{ rpm_root_dir }}/repo
--- a/roles/rpm_build_server/templates/mock/el9-x86_64.cfg.j2
+++ b/roles/rpm_build_server/templates/mock/el9-x86_64.cfg.j2
@ -0,0 +1,26 @@
+include('templates/almalinux-9.tpl')
+include('templates/epel-9.tpl')
+
+config_opts['chroot_setup_cmd'] += " gcc gcc-c++ perl-srpm-macros perl-macros"
+config_opts['root'] = 'el9-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['macros']['%rhel'] = '9'
+config_opts['macros']['%dist'] = '.el9.dbd'
+
+config_opts['dnf.conf'] += """
+
+[rpmfusion-free-updates]
+baseurl = http://download1.rpmfusion.org/free/el/updates/9/x86_64/
+gpgcheck = 1
+gpgkey = https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-free-el-9
+name = RPM Fusion for EL - Free - Updates
+
+[dbd]
+name=dbd
+baseurl=http://rpms.lapiole.org/el9/
+enabled=1
+gpgcheck=1
+gpgkey=https://rpms.lapiole.org/RPM-GPG-KEY
+
+"""
--- a/roles/squid/files/acl/software_various.domains
+++ b/roles/squid/files/acl/software_various.domains
@ -385,3 +385,6 @@ repo.iotti.biz

 # Squash TM
 nexus.squashtest.org
+
+# Hashicorp products (Nomad, Consul, Vault etc.)
+releases.hashicorp.com
--- a/roles/zabbix_agent/vars/RedHat-9.yml
+++ b/roles/zabbix_agent/vars/RedHat-9.yml
@ -0,0 +1,7 @@
+---
+
+zabbix_agent_packages:
+  - zabbix-agent-addons
+  - policycoreutils-python-utils
+  - openssl
+