* Thu Apr 10 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-10.sme

- fix login to roundcube after restore [SME: 12981]

createlinks

@@ -49,21 +49,14 @@ for  my $event (qw(
     smeserver-roundcube-update
     conf-roundcube
     roundcube-update
-    post-install
-    post-upgrade
     ))
 {
-    templates2events("/etc/opt/remi/php81/php-fpm.d/www.conf",$event);
-    templates2events("/etc/httpd/conf/httpd.conf", $event);
-    templates2events("/etc/dovecot/dovecot.conf", $event);
     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/php81-php-fpm");
     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
     safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dovecot");
 }
 
-
-#We want to expand /etc/e-smith/templates-user/.qmail
 foreach my $event (qw(
     smeserver-roundcube-update
     conf-roundcube
@@ -72,6 +65,10 @@ foreach my $event (qw(
     post-upgrade
    ))
 {
+
+    templates2events("/etc/opt/remi/php81/php-fpm.d/www.conf",$event);
+    templates2events("/etc/httpd/conf/httpd.conf", $event);
+    templates2events("/etc/dovecot/dovecot.conf", $event);
     event_link("qmail-update-user", $event, "20");
     event_link("roundcube-conf", $event, "05");
 }

root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube

@@ -3,23 +3,20 @@
     my $user = $roundcube{DbUser} || 'roundcube';
     my $pass = $roundcube{DbPassword} || 'changeme';
     $OUT .= <<END
-#! /bin/sh
+#!/bin/sh
-    if [ -d /var/lib/mysql/$db ]; then
+
-#if you need to add plugins:
+    /usr/bin/mariadb <<EOF
-#    /usr/bin/mysql  $db < /usr/share/roundcubemail/plugins/calendar/drivers/database/SQL/mysql.initial.sql
+    CREATE DATABASE IF NOT EXISTS $db DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-#    /usr/bin/mysql  $db < /usr/share/roundcubemail/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql
-#    /usr/bin/mysql  $db < /usr/share/roundcubemail/plugins/tasklist/drivers/database/SQL/mysql.initial.sql
-    exit
-    fi
-    /usr/bin/mysql <<EOF
-    CREATE DATABASE $db DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-    use $db;
-    source /usr/share/roundcubemail/SQL/mysql.initial.sql;
     use mysql;
     GRANT ALL PRIVILEGES ON $db.* TO $user\@localhost
             IDENTIFIED BY '$pass';
     flush privileges;
 EOF
 
+    if [ ! -f /var/lib/mysql/$db/users.ibd ] ; then
+        cat /usr/share/roundcubemail/SQL/mysql.initial.sql | /usr/bin/mariadb $db
+    fi
+
+exit 0
 END
 }

smeserver-roundcube.spec

@@ -1,8 +1,8 @@
 %define name smeserver-roundcube
 %define version 1.6
-%define release 7
+%define release 10
 
-Summary: smserver rpm to setup roundcube, an IMAP mail client
+Summary: smeserver rpm to setup roundcube, an IMAP mail client
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
@@ -85,6 +85,12 @@ fi
 %attr(755,root,root) /usr/bin/rcplugin_update.sh
 
 %changelog
+* Thu Apr 10 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-10.sme
+- fix login to roundcube after restore [SME: 12981]
+
+* Sun Mar 30 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-8.sme
+- remove service handling from post-upgrade event [SME: 12977]
+
 * Mon Feb 17 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-7.sme
 - fix roundcube not accessible after install [SME: 12928]
 - avoid need to relog in case of reloading of configuration [SME: 12929]