Compare commits

..

No commits in common. "master" and "1_6-8_el8_sme" have entirely different histories.

2 changed files with 14 additions and 14 deletions

View File

@ -4,19 +4,22 @@
my $pass = $roundcube{DbPassword} || 'changeme'; my $pass = $roundcube{DbPassword} || 'changeme';
$OUT .= <<END $OUT .= <<END
#! /bin/sh #! /bin/sh
if [ -d /var/lib/mysql/$db ]; then
/usr/bin/mariadb <<EOF #if you need to add plugins:
CREATE DATABASE IF NOT EXISTS $db DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; # /usr/bin/mysql $db < /usr/share/roundcubemail/plugins/calendar/drivers/database/SQL/mysql.initial.sql
# /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; use mysql;
GRANT ALL PRIVILEGES ON $db.* TO $user\@localhost GRANT ALL PRIVILEGES ON $db.* TO $user\@localhost
IDENTIFIED BY '$pass'; IDENTIFIED BY '$pass';
flush privileges; flush privileges;
EOF 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 END
} }

View File

@ -1,8 +1,8 @@
%define name smeserver-roundcube %define name smeserver-roundcube
%define version 1.6 %define version 1.6
%define release 10 %define release 8
Summary: smeserver rpm to setup roundcube, an IMAP mail client Summary: smserver rpm to setup roundcube, an IMAP mail client
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
@ -85,9 +85,6 @@ fi
%attr(755,root,root) /usr/bin/rcplugin_update.sh %attr(755,root,root) /usr/bin/rcplugin_update.sh
%changelog %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 * Sun Mar 30 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-8.sme
- remove service handling from post-upgrade event [SME: 12977] - remove service handling from post-upgrade event [SME: 12977]