Typo in spec file

- 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]

createlinks

@@ -17,7 +17,7 @@ for ( qw(install remove update) )
     event_link("dnf-action", "dnf-$_", "20");
 }
 
-safe_symlink("restart", "root/etc/e-smith/events/dnf-modify/services2adjust/yum");
+safe_symlink("restart", "root/etc/e-smith/events/dnf-modify/services2adjust/dnf");
 
 for ( qw(bootstrap-console-save dnf-update smeserver-update-update) )
 {
@@ -31,6 +31,8 @@ event_link("systemd-default", $event, "88");
 templates2events("/etc/rsyslog.conf",$event);
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog");
 
+event_link("dnf_modules", 'post-install', "70");
+
 #--------------------------------------------------
 # functions for manager panel
 #--------------------------------------------------

root/etc/e-smith/events/actions/dnf_modules

@@ -0,0 +1,14 @@
+#!/usr/bin/python3
+import dnf
+
+base = dnf.Base()
+base.read_all_repos()
+base.fill_sack()
+
+module_base = dnf.module.module_base.ModuleBase(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'])
+
+base.do_transaction()

root/etc/e-smith/templates/etc/dnf/automatic.conf/50base

@@ -5,7 +5,7 @@
 # -4: critical
 # -3: critical+errors
 # -2: critical+errors+warnings (default)
-debuglevel = -{ $dnf{Debug} || '2' }
+debuglevel = { $dnf{Debug} || '2' }
 
 # Uncomment to auto-import new gpg keys (dangerous)
 # assumeyes = True

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

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',
@@ -437,7 +437,8 @@ class SMEServer(dnf.Plugin):
         for act in ('navigation-conf','systemd-reload','systemd-default'):
             global iter 
             iter = 0
-            for key in actionlist.keys():
+            tmpactionlist = actionlist
+            for key in list(tmpactionlist):
                     if key.endswith(act):
                         iter += 1
                         if iter>1:

root/usr/lib/systemd/system/dnf-automatic-download.service.d/50koozali.conf

@@ -0,0 +1,2 @@
+[Service]
+SyslogIdentifier=dnf-automatic

root/usr/lib/systemd/system/dnf-automatic-install.service.d/50koozali.conf

@@ -0,0 +1,2 @@
+[Service]
+SyslogIdentifier=dnf-automatic

root/usr/lib/systemd/system/dnf-automatic-notifyonly.service.d/50koozali.conf

@@ -0,0 +1,2 @@
+[Service]
+SyslogIdentifier=dnf-automatic

root/usr/lib/systemd/system/dnf-automatic.service.d/50koozali.conf

@@ -0,0 +1,2 @@
+[Service]
+SyslogIdentifier=dnf-automatic

root/usr/lib/systemd/system/dnf-makecache.service.d/50koozali.conf

@@ -0,0 +1,3 @@
+[Service]
+SyslogIdentifier=dnf-makecache
+

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

smeserver-update.spec

@@ -2,7 +2,7 @@
 Summary: Koozali SME Server rpm updater
 Name: %{name}
 %define version 11.0.0
-%define release 8
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -68,6 +68,22 @@ mkdir -p root/etc/yum.smerepos.d
 
 
 %changelog
+* Wed Aug 21 2024 Brian Read <brianr@koozali.org> 11.0.0-13.sme
+- Fix error in createlinks - link to restart yum should be dnf [SME: 12723]
+
+* Sat May 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 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 <jpp@koozali.org> 11.0.0-11.sme
+- fix debuglevel=-2 not allowed [SME: 12637]
+- force modules needed for core [SME: 12618]
+  php:remi-8.3 perl:5.26 python36:3.6 mariadb:10.5
+
+* Thu Apr 18 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-10.sme
+- fix RuntimeError: dictionary changed size during iteration [SME: 12633]
+
 * Tue Apr 16 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
 - fix python error in dnf plugin [SME: 12631]