* Wed Mar 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-19.sme

- set module php 84 [SME: 12952]
- remove openfusion repo [SME: 12882]

contriborbase

@@ -1 +0,0 @@
-sme10

createlinks

@@ -24,6 +24,11 @@ for ( qw(bootstrap-console-save dnf-update smeserver-update-update) )
     event_link("rpm-import-keys", $_, "10");
 }
 
+for ( qw(post-install post-upgrade console-save))
+{
+   event_link("dnf_modules", $_, "70");
+}
+
 my $event= "smeserver-update-update";
 # systemd-specific action mandatory for this package-update event
 event_link("systemd-reload", $event, "89");
@@ -31,8 +36,6 @@ 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/db/yum_repositories/defaults/appstream/Name

@@ -1 +1 @@
-Rocky Linux $releasever - AppStream
+Rocky Linux - AppStream

root/etc/e-smith/db/yum_repositories/defaults/baseos/Name

@@ -1 +1 @@
-Rocky Linux $releasever - BaseOS
+Rocky Linux - BaseOS

root/etc/e-smith/db/yum_repositories/defaults/extras/Name

@@ -1 +1 @@
-Rocky Linux $releasever - Extras 
+Rocky Linux - Extras 

root/etc/e-smith/db/yum_repositories/defaults/powertools/Name

@@ -1 +1 @@
-Rocky Linux $releasever - AppStream
+Rocky Linux - PowerTools

root/etc/e-smith/db/yum_repositories/defaults/smeaddons/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smeaddons-10
+https://mirrorlist.koozali.org/mirrorlist/smeaddons-11

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/MirrorList

@@ -0,0 +1 @@
+https://mirrorlist.koozali.org/mirrorlist/smecontribs-testing-11

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/Name

@@ -0,0 +1 @@
+SME Server - contribs-testing

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/Visible

@@ -0,0 +1 @@
+no

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/status

@@ -0,0 +1 @@
+disabled

root/etc/e-smith/db/yum_repositories/defaults/smecontribs/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smecontribs-10
+https://mirrorlist.koozali.org/mirrorlist/smecontribs-11

root/etc/e-smith/db/yum_repositories/defaults/smedev/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smedev-10
+https://mirrorlist.koozali.org/mirrorlist/smedev-11

root/etc/e-smith/db/yum_repositories/defaults/smeos/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smeos-10
+https://mirrorlist.koozali.org/mirrorlist/smeos-11

root/etc/e-smith/db/yum_repositories/defaults/smetest/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smetest-10
+https://mirrorlist.koozali.org/mirrorlist/smetest-11

root/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smeupdates-testing-10
+https://mirrorlist.koozali.org/mirrorlist/smeupdates-testing-11

root/etc/e-smith/db/yum_repositories/defaults/smeupdates/MirrorList

@@ -1 +0,0 @@
-https://mirrorlist.koozali.org/mirrorlist/smeupdates-10

root/etc/e-smith/db/yum_repositories/defaults/smeupdates/Name

@@ -1 +0,0 @@
-SME Server - updates

root/etc/e-smith/db/yum_repositories/defaults/smeupdates/Visible

@@ -1 +0,0 @@
-yes

root/etc/e-smith/db/yum_repositories/defaults/smeupdates/status

@@ -1 +0,0 @@
-enabled

root/etc/e-smith/db/yum_repositories/migrate/20UpstreamRepos

@@ -1,5 +1,5 @@
 {
-    for my $name ( qw(appstream baseos extras remi-safe remi-modular) )
+    for my $name ( qw(appstream baseos powertools extras remi-safe remi-modular) )
     {
 	my $repo = $DB->get($name) or next;
 

root/etc/e-smith/db/yum_repositories/migrate/30DeleteDeprecatedRepo

@@ -1,5 +1,5 @@
 {
-    for my $name ( qw(addons contrib dungog fws base centosplus fasttrack updates) )
+    for my $name ( qw(addons contrib dungog fws base centosplus fasttrack updates smeupdates openfusion) )
     {
     	my $repo = $DB->get($name);
     	$repo->delete if $repo;

root/etc/e-smith/db/yum_repositories/migrate/40GlobalMirrorList

@@ -1,6 +1,6 @@
 {
-    for my $name ( qw(smeaddons smecontribs smedev smeextras smeos smetest 
-                      smeupdates smeupdates-testing) )
+    for my $name ( qw(smeaddons smecontribs smecontribs-testing smedev smeextras smeos smetest 
+                      smeupdates-testing) )
     {
 	my $repo = $DB->get($name) or next;
 

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

@@ -6,7 +6,7 @@ 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(['php:remi-8.4'])
 module_base.switch_to(['perl:5.26'])
 module_base.switch_to(['python36:3.6'])
 module_base.switch_to(['mariadb:10.5'])

root/etc/e-smith/templates/etc/dnf/dnf.conf/10main_deltarpm

@@ -1,6 +1,6 @@
 {
 my $deltaRpm = $dnf{DeltaRpmProcess} || 'disabled';
 $deltaRpm = '0' if ($deltaRpm eq 'disabled');
-$deltaRpm = '2' if ($deltaRpm eq 'enabled');
+$deltaRpm = '1' if ($deltaRpm eq 'enabled');
 $OUT .= "deltarpm=$deltaRpm";
 }

root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py

@@ -53,7 +53,7 @@ servicenames['mariadb']='mariadb',
 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',
+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', 'php84-php-fpm',
 servicenames['proftp']='ftp',
 servicenames['samba']='smb',
 servicenames['spamassassin']='spamassassin',

root/usr/lib/systemd/system/dnf.service

@@ -5,6 +5,7 @@ After=network-pre.target networking.service
 [Service]
 Type=forking
 SyslogIdentifier=dnf_update_dbs
+ExecStartPre=-/etc/e-smith/events/actions/dnf_modules
 ExecStartPre=/sbin/e-smith/service-status dnf
 ExecStart=/sbin/e-smith/dnf_update_dbs
 TimeoutSec=0

root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm

@@ -180,7 +180,7 @@ sub get_status
 {
     my ($fm, $prop, $localise) = @_;
 
-    my $status = $db->get_prop("yum", $prop) || 'disabled';
+    my $status = $db->get_prop("dnf", $prop) || 'disabled';
 
     return $status unless $localise;
 
@@ -196,7 +196,7 @@ sub change_settings
 			PackageFunctions
             	) )
     {
-	$db->set_prop('yum', $param, $q->param("yum_$param"));
+	$db->set_prop('dnf', $param, $q->param("yum_$param"));
     }
 
     my $check4updates = $q->param("yum_check4updates");
@@ -204,21 +204,21 @@ sub change_settings
 
     if ($check4updates ne 'disabled') { $status = 'enabled'; }
 
-    $db->set_prop('yum', 'check4updates', $check4updates);
+    $db->set_prop('dnf', 'check4updates', $check4updates);
 
     my $deltarpm = $q->param("yum_DeltaRpmProcess");
-    $db->set_prop('yum', 'DeltaRpmProcess', $deltarpm);
+    $db->set_prop('dnf', 'DeltaRpmProcess', $deltarpm);
 
     my $downloadonly = $q->param("yum_DownloadOnly");
     if ($downloadonly ne 'disabled') { $status = 'enabled'; }
 
-    $db->set_prop('yum', 'DownloadOnly', $downloadonly);
+    $db->set_prop('dnf', 'DownloadOnly', $downloadonly);
 
     my $AutoInstallUpdates = $q->param("yum_AutoInstallUpdates");
     if ($AutoInstallUpdates ne 'disabled') { $status = 'enabled'; }
 
-    $db->set_prop('yum', 'AutoInstallUpdates', $AutoInstallUpdates);
-    $db->set_prop('yum', 'status', $status);
+    $db->set_prop('dnf', 'AutoInstallUpdates', $AutoInstallUpdates);
+    $db->set_prop('dnf', 'status', $status);
 
     my %selected = map {$_ => 1} $q->param('SelectedRepositories');
 

smeserver-update.spec

@@ -2,7 +2,7 @@
 Summary: Koozali SME Server rpm updater
 Name: %{name}
 %define version 11.0.0
-%define release 15
+%define release 19
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -68,6 +68,21 @@ mkdir -p root/etc/yum.smerepos.d
 
 
 %changelog
+* Wed Mar 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-19.sme
+- set module php 84 [SME: 12952]
+- remove openfusion repo [SME: 12882]
+
+* Sat Feb 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-18.sme
+- fix deltarpm is now a bolean [SME: 12755]
+
+* Sat Dec 21 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-17.sme
+- set our prefered modules on different events and dnf.service run [SME: 12618]
+- update old manager to use dnf key instead of yum for settings [SME: 12831]
+- clean rocky yum_repositories property Name content  [SME: 12806]
+
+* Sat Nov 30 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme
+-  remove smeupdates and add smecontribs-testing  [SME: 12804]
+
 * Fri Nov 15 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-15.sme
 - add PowerTools repo needed for openldap-server [SME: 12790]
 - add SME 11 gpg key