From 1499342c591243538d01698f92fea5cc3f81a6cc Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 14 Sep 2023 12:00:16 +0200 Subject: [PATCH] Update to 2023-09-14 12:00 --- roles/common/handlers/main.yml | 3 -- .../templates/llng-fastcgi-server.service.j2 | 2 +- .../templates/llng-uwsgi.service.j2 | 2 +- roles/lemonldap_ng/vars/RedHat-7.yml | 1 + roles/lemonldap_ng/vars/RedHat-8.yml | 2 ++ roles/lemonldap_ng/vars/RedHat-9.yml | 30 +++++++++++++++++++ 6 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 roles/lemonldap_ng/vars/RedHat-9.yml diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml index d416f7a..83788ab 100644 --- a/roles/common/handlers/main.yml +++ b/roles/common/handlers/main.yml @@ -26,8 +26,5 @@ service: name=systemd-journal-upload state=restarted when: remote_journal is defined -- name: restart journald - service: name=systemd-journald state=restarted - - name: load kmods service: name=systemd-modules-load state=restarted diff --git a/roles/lemonldap_ng/templates/llng-fastcgi-server.service.j2 b/roles/lemonldap_ng/templates/llng-fastcgi-server.service.j2 index 2a2fdf0..3d9e5d1 100644 --- a/roles/lemonldap_ng/templates/llng-fastcgi-server.service.j2 +++ b/roles/lemonldap_ng/templates/llng-fastcgi-server.service.j2 @@ -15,7 +15,7 @@ PrivateDevices=yes ProtectSystem=full ProtectHome=yes NoNewPrivileges=yes -MemoryLimit={{ llng_workers * 250 }}M +MemoryMax={{ llng_workers * 250 }}M Restart=on-failure StartLimitInterval=0 RestartSec=1 diff --git a/roles/lemonldap_ng/templates/llng-uwsgi.service.j2 b/roles/lemonldap_ng/templates/llng-uwsgi.service.j2 index 40a4ea1..5288e6c 100644 --- a/roles/lemonldap_ng/templates/llng-uwsgi.service.j2 +++ b/roles/lemonldap_ng/templates/llng-uwsgi.service.j2 @@ -35,7 +35,7 @@ PrivateDevices=yes ProtectSystem=full ProtectHome=yes NoNewPrivileges=yes -MemoryLimit={{ llng_workers * 250 }}M +MemoryMax={{ llng_workers * 250 }}M Restart=on-failure StartLimitInterval=0 RestartSec=1 diff --git a/roles/lemonldap_ng/vars/RedHat-7.yml b/roles/lemonldap_ng/vars/RedHat-7.yml index bddc092..e6586af 100644 --- a/roles/lemonldap_ng/vars/RedHat-7.yml +++ b/roles/lemonldap_ng/vars/RedHat-7.yml @@ -15,6 +15,7 @@ llng_portal_packages: - lasso-perl - perl-Authen-Captcha - perl-Auth-Yubikey_WebClient + - perl-Authen-WebAuthn llng_manager_packages: - lemonldap-ng-manager diff --git a/roles/lemonldap_ng/vars/RedHat-8.yml b/roles/lemonldap_ng/vars/RedHat-8.yml index 0e05092..7889807 100644 --- a/roles/lemonldap_ng/vars/RedHat-8.yml +++ b/roles/lemonldap_ng/vars/RedHat-8.yml @@ -16,6 +16,8 @@ llng_portal_packages: - lasso-perl - perl-Authen-Captcha - perl-Auth-Yubikey_WebClient + - perl-Authen-WebAuthn + - perl-Glib llng_manager_packages: - lemonldap-ng-manager diff --git a/roles/lemonldap_ng/vars/RedHat-9.yml b/roles/lemonldap_ng/vars/RedHat-9.yml new file mode 100644 index 0000000..4ebca2d --- /dev/null +++ b/roles/lemonldap_ng/vars/RedHat-9.yml @@ -0,0 +1,30 @@ +--- + +llng_common_packages: + - lemonldap-ng-conf + - perl-Cache-Cache + - lemonldap-ng-fastcgi-server + - python3-PyMySQL + - uwsgi-plugin-psgi + - uwsgi-logger-systemd + +llng_portal_packages: + - python3-passlib + - lemonldap-ng-portal + - lemonldap-ng-doc + - lasso + - lasso-perl + - perl-Authen-Captcha + - perl-Auth-Yubikey_WebClient + - perl-Authen-WebAuthn + - perl-Glib + +llng_manager_packages: + - lemonldap-ng-manager + - lemonldap-ng-doc + +llng_mysql_packages: + - perl-DBD-MySQL + - python3-PyMySQL + - mariadb + - perl-Apache-Session-Browseable