From 45e3c516b53d86cec7a09c925b97c982602368f4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Sat, 11 May 2024 21:34:47 -0400 Subject: [PATCH] * Sat May 11 2024 Jean-Philippe Pialasse 11.0.0-12.sme - revert plugin changes to force modules [SME: 12618] - tag service to limit log noise in message [SME: 12668] - sort nut service to restart [SME: 12662] --- .../templates/etc/rsyslog.conf/32smeserver-update | 5 +++-- .../python3.6/site-packages/dnf-plugins/smeserver.py | 12 +----------- .../dnf-automatic-download.service.d/50koozali.conf | 2 ++ .../dnf-automatic-install.service.d/50koozali.conf | 2 ++ .../50koozali.conf | 2 ++ .../system/dnf-automatic.service.d/50koozali.conf | 2 ++ .../system/dnf-makecache.service.d/50koozali.conf | 3 +++ root/usr/lib/systemd/system/dnf.service | 1 + smeserver-update.spec | 7 ++++++- 9 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 root/usr/lib/systemd/system/dnf-automatic-download.service.d/50koozali.conf create mode 100644 root/usr/lib/systemd/system/dnf-automatic-install.service.d/50koozali.conf create mode 100644 root/usr/lib/systemd/system/dnf-automatic-notifyonly.service.d/50koozali.conf create mode 100644 root/usr/lib/systemd/system/dnf-automatic.service.d/50koozali.conf create mode 100644 root/usr/lib/systemd/system/dnf-makecache.service.d/50koozali.conf diff --git a/root/etc/e-smith/templates/etc/rsyslog.conf/32smeserver-update b/root/etc/e-smith/templates/etc/rsyslog.conf/32smeserver-update index 7a28980..24a887c 100644 --- a/root/etc/e-smith/templates/etc/rsyslog.conf/32smeserver-update +++ b/root/etc/e-smith/templates/etc/rsyslog.conf/32smeserver-update @@ -1,4 +1,5 @@ -#dnf Koozali SME Server updater +#dnf Koozali SME Server updater, dnf automatic and dnf makecache if $programname startswith "dnf_update_dbs" then /var/log/dnf/dnf-update.log & stop - +if $programname startswith "dnf-automatic" then stop +if $programname startswith "dnf-makecache" theb stop diff --git a/root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py b/root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py index 5f69b51..02ca4ef 100644 --- a/root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py +++ b/root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py @@ -50,7 +50,7 @@ servicenames['freeradius']='radiusd', servicenames['httpd']='httpd-admin','httpd-e-smith', servicenames['iptables']='masq', servicenames['mariadb']='mariadb', -servicenames['nut']='nut-server','nut-driver','nut-monitor', +servicenames['nut']='nut', servicenames['openldap']='ldap', servicenames['openssh']='sshd', servicenames['php']='httpd-e-smith', 'php72-php-fpm', 'php73-php-fpm', 'php74-php-fpm', 'php80-php-fpm', 'php81-php-fpm', 'php82-php-fpm', 'php83-php-fpm', @@ -122,19 +122,9 @@ class SMEServer(dnf.Plugin): global ourfile ourfile = True self.report_yum_status('sack') - module_base = dnf.module.module_base.ModuleBase(self.base) - module_base.switch_to(['php:remi-8.3']) - module_base.switch_to(['perl:5.26']) - module_base.switch_to(['python36:3.6']) - module_base.switch_to(['mariadb:10.5']) def resolved(self): self.report_yum_status('resolved') - module_base = dnf.module.module_base.ModuleBase(self.base) - module_base.switch_to(['php:remi-8.3']) - module_base.switch_to(['perl:5.26']) - module_base.switch_to(['python36:3.6']) - module_base.switch_to(['mariadb:10.5']) #2 PKG_DOWNGRADE = dnf.transaction.PKG_DOWNGRADE # :api #1 PKG_INSTALL = dnf.transaction.PKG_INSTALL # :api diff --git a/root/usr/lib/systemd/system/dnf-automatic-download.service.d/50koozali.conf b/root/usr/lib/systemd/system/dnf-automatic-download.service.d/50koozali.conf new file mode 100644 index 0000000..93aaf6e --- /dev/null +++ b/root/usr/lib/systemd/system/dnf-automatic-download.service.d/50koozali.conf @@ -0,0 +1,2 @@ +[Service] +SyslogIdentifier=dnf-automatic diff --git a/root/usr/lib/systemd/system/dnf-automatic-install.service.d/50koozali.conf b/root/usr/lib/systemd/system/dnf-automatic-install.service.d/50koozali.conf new file mode 100644 index 0000000..93aaf6e --- /dev/null +++ b/root/usr/lib/systemd/system/dnf-automatic-install.service.d/50koozali.conf @@ -0,0 +1,2 @@ +[Service] +SyslogIdentifier=dnf-automatic diff --git a/root/usr/lib/systemd/system/dnf-automatic-notifyonly.service.d/50koozali.conf b/root/usr/lib/systemd/system/dnf-automatic-notifyonly.service.d/50koozali.conf new file mode 100644 index 0000000..93aaf6e --- /dev/null +++ b/root/usr/lib/systemd/system/dnf-automatic-notifyonly.service.d/50koozali.conf @@ -0,0 +1,2 @@ +[Service] +SyslogIdentifier=dnf-automatic diff --git a/root/usr/lib/systemd/system/dnf-automatic.service.d/50koozali.conf b/root/usr/lib/systemd/system/dnf-automatic.service.d/50koozali.conf new file mode 100644 index 0000000..93aaf6e --- /dev/null +++ b/root/usr/lib/systemd/system/dnf-automatic.service.d/50koozali.conf @@ -0,0 +1,2 @@ +[Service] +SyslogIdentifier=dnf-automatic diff --git a/root/usr/lib/systemd/system/dnf-makecache.service.d/50koozali.conf b/root/usr/lib/systemd/system/dnf-makecache.service.d/50koozali.conf new file mode 100644 index 0000000..e03ace2 --- /dev/null +++ b/root/usr/lib/systemd/system/dnf-makecache.service.d/50koozali.conf @@ -0,0 +1,3 @@ +[Service] +SyslogIdentifier=dnf-makecache + diff --git a/root/usr/lib/systemd/system/dnf.service b/root/usr/lib/systemd/system/dnf.service index 918c0d4..fe18abf 100644 --- a/root/usr/lib/systemd/system/dnf.service +++ b/root/usr/lib/systemd/system/dnf.service @@ -4,6 +4,7 @@ After=network-pre.target networking.service [Service] Type=forking +SyslogIdentifier=dnf_update_dbs ExecStartPre=/sbin/e-smith/service-status dnf ExecStart=/sbin/e-smith/dnf_update_dbs TimeoutSec=0 diff --git a/smeserver-update.spec b/smeserver-update.spec index ec754fa..7a45b9f 100644 --- a/smeserver-update.spec +++ b/smeserver-update.spec @@ -2,7 +2,7 @@ Summary: Koozali SME Server rpm updater Name: %{name} %define version 11.0.0 -%define release 11 +%define release 12 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -68,6 +68,11 @@ mkdir -p root/etc/yum.smerepos.d %changelog +* Sat May 11 2024 Jean-Philippe Pialasse 11.0.0-12.sme +- revert plugin changes to force modules [SME: 12618] +- tag service to limit log noise in message [SME: 12668] +- sort nut service to restart [SME: 12662] + * Tue Apr 23 2024 Jean-Philippe Pialasse 11.0.0-11.sme - fix debuglevel=-2 not allowed [SME: 12637] - force modules needed for core [SME: 12618]