* Wed May 28 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-25.sme

- MariaDB restart on update [SME: 13019]

createlinks

@@ -19,12 +19,12 @@ for ( qw(install remove update) )
 
 safe_symlink("restart", "root/etc/e-smith/events/dnf-modify/services2adjust/dnf");
 
-for ( qw(bootstrap-console-save dnf-update smeserver-update-update) )
+for ( qw(bootstrap-console-save dnf-update ) )
 {
     event_link("rpm-import-keys", $_, "10");
 }
 
-for ( qw(post-install post-upgrade console-save))
+for ( qw(smeserver-update-update post-install post-upgrade console-save))
 {
    event_link("dnf_modules", $_, "70");
 }

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

@@ -1,14 +1,47 @@
-#!/usr/bin/python3
+#!/bin/bash
-import dnf
+#----------------------------------------------------------------------
+# copyright (C) 2025 Koozali Foundation Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+#----------------------------------------------------------------------
 
-base = dnf.Base()
+# set mariadb as disabled, as we use rpm directly from MariaDB
-base.read_all_repos()
+printf '[mariadb]
-base.fill_sack()
+name=mariadb
+stream=
+profiles=
+state=disabled' | crudini --merge /etc/dnf/modules.d/mariadb.module
 
-module_base = dnf.module.module_base.ModuleBase(base)
+# set perl 5.26
-module_base.switch_to(['php:remi-8.4'])
+printf '[perl]
-module_base.switch_to(['perl:5.26'])
+name=perl
-module_base.switch_to(['python36:3.6'])
+stream=5.26
-module_base.disable(['mariadb:10.5'])
+profiles=
+state=enabled' | crudini --merge /etc/dnf/modules.d/perl.module
+
+# set php module to our default
+printf '[php]
+name=php
+stream=remi-8.4
+profiles=
+state=enabled' | crudini --merge /etc/dnf/modules.d/php.module php
+
+# set python to 3.6
+printf '[python36]
+name=python36
+stream=3.6
+profiles=
+state=enabled' | crudini --merge /etc/dnf/modules.d/python36.module
 
-base.do_transaction()

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

@@ -50,6 +50,7 @@ servicenames['freeradius']='radiusd',
 servicenames['httpd']='httpd-admin','httpd-e-smith',
 servicenames['iptables']='masq',
 servicenames['mariadb']='mariadb',
+servicenames['MariaDB']='mariadb',
 servicenames['nut']='nut',
 servicenames['openldap']='ldap',
 servicenames['openssh']='sshd',

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

@@ -8,6 +8,7 @@ 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
+ExecStartPost=/etc/e-smith/events/actions/rpm-import-keys
 TimeoutSec=0
 RemainAfterExit=yes
 

smeserver-update.spec

@@ -2,7 +2,7 @@
 Summary: Koozali SME Server rpm updater
 Name: %{name}
 %define version 11.0.0
-%define release 21
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -25,6 +25,7 @@ Requires: python3-dnf-plugin-post-transaction-actions
 Requires: python3-dnf-plugin-versionlock
 Requires: perl(File::Slurp)
 Requires: mailx
+Requires: crudini
 BuildRequires: smeserver-devtools 
 BuildRequires: python3
 AutoReqProv: no
@@ -68,6 +69,16 @@ mkdir -p root/etc/yum.smerepos.d
 
 
 %changelog
+* Wed May 28 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-25.sme
+- MariaDB restart on update [SME: 13019]
+
+* Wed May 28 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-24.sme
+- fix not all gpg keys are imported during dnf transaction [SME: 13010]
+
+* Fri Mar 14 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-23.sme
+- deactivate mariadb 10.5 module (do it on update) [SME: 12955]
+- rewrite module setting to avoid failure [SME: 12962]
+  
 * Wed Mar 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-21.sme
 - fix not all gpg keys are imported [SME: 12960]