@@ -1497,38 +1497,26 @@ if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
14971497 cp -f $hestiacp /roundcube/apache.conf /etc/roundcube/
14981498 ln -s /etc/roundcube/apache.conf /etc/apache2/conf.d/roundcube.conf
14991499 fi
1500- cp -f $hestiacp /roundcube/main.inc.php /etc/roundcube/
1501- cp -f $hestiacp /roundcube/db.inc.php /etc/roundcube/
1502- chmod 640 /etc/roundcube/debian-db-roundcube.php
1500+ cp -f $hestiacp /roundcube/main.inc.php /etc/roundcube/config.inc.php
1501+ cp -f $hestiacp /roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php
1502+ cp -f $hestiacp /roundcube/config.inc.php /etc/roundcube/plugins/password/
1503+ cp -f $hestiacp /roundcube/hestia.php /usr/share/roundcube/plugins/password/drivers/
1504+ touch /var/log/roundcube/errors
15031505 chmod 640 /etc/roundcube/config.inc.php
1504- chown root:www-data /etc/roundcube/debian-db-roundcube.php
15051506 chown root:www-data /etc/roundcube/config.inc.php
1506- cp -f $hestiacp /roundcube/hestia.php \
1507- /usr/share/roundcube/plugins/password/drivers/
1508- cp -f $hestiacp /roundcube/config.inc.php /etc/roundcube/plugins/password/
1507+ chmod 640 /etc/roundcube/debian-db-roundcube.php
1508+ chown root:www-data /etc/roundcube/debian-db-roundcube.php
1509+ chmod 640 /var/log/roundcube/errors
1510+ chown www-data:adm /var/log/roundcube/errors
1511+
15091512 r=" $( gen_pass) "
15101513 mysql -e " CREATE DATABASE roundcube"
1511- mysql -e " GRANT ALL ON roundcube.*
1514+ mysql -e " GRANT ALL ON roundcube.*
15121515 TO roundcube@localhost IDENTIFIED BY '$r '"
1513- sed -i " s/%password%/$r /g" /etc/roundcube/db.inc.php
1514- sed -i " s/localhost/$servername /g" \
1515- /etc/roundcube/plugins/password/config.inc.php
1516+ sed -i " s/%password%/$r /g" /etc/roundcube/debian-db-roundcube.php
1517+ sed -i " s/localhost/$servername /g" /etc/roundcube/plugins/password/config.inc.php
15161518 mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql
1517- chmod a+r /etc/roundcube/main.inc.php
1518-
1519- # Send all emails through SMTP and add user information
1520- sed -i " /\$ config\['smtp_server'\]/c\$ config\['smtp_server'\] = 'localhost';" /etc/roundcube/defaults.inc.php
1521- sed -i " /\$ config\['smtp_user'\]/c\$ config\['smtp_user'\] = '%u';" /etc/roundcube/defaults.inc.php
1522- sed -i " /\$ config\['smtp_pass'\]/c\$ config\['smtp_pass'\] = '%p';" /etc/roundcube/defaults.inc.php
1523-
1524- if [ " $release " -eq 8 ] || [ " $release " -eq 9 ]; then
1525- mv -f /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php
1526- mv -f /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php
1527- chmod 640 /etc/roundcube/debian-db-roundcube.php
1528- chmod 640 /etc/roundcube/config.inc.php
1529- chown root:www-data /etc/roundcube/debian-db-roundcube.php
1530- chown root:www-data /etc/roundcube/config.inc.php
1531- fi
1519+
15321520 if [ " $release " -eq 8 ]; then
15331521 # RoundCube tinyMCE fix
15341522 tinymceFixArchiveURL=$hestiacp /roundcube/roundcube-tinymce.tar.gz
0 commit comments