wtserver 0.21

distros/debian12/install_mta.sh

@@ -86,7 +86,7 @@ InstallMTA() {
 		/etc/dovecot/conf.d/10-mail.conf
   
 	    # Create, subscribe, and mark as special folders: INBOX, Drafts, Sent, Trash, Spam and Archive.
-	    cp conf/dovecot-mailboxes.conf /etc/dovecot/conf.d/15-mailboxes.conf
+	    cp $APWD/conf/dovecot-mailboxes.conf /etc/dovecot/conf.d/15-mailboxes.conf
 	    sed -i "s/#mail_plugins =\(.*\)/mail_plugins =\1 \$mail_plugins quota/" /etc/dovecot/conf.d/10-mail.conf
 	    if ! grep -q "mail_plugins.* imap_quota" /etc/dovecot/conf.d/20-imap.conf; then
 		sed -i "s/\(mail_plugins =.*\)/\1\n  mail_plugins = \$mail_plugins imap_quota/" /etc/dovecot/conf.d/20-imap.conf
@@ -239,7 +239,7 @@ EOF
 	    # Copy the global sieve script into where we've told Dovecot to look for it. Then
 	    # compile it. Global scripts must be compiled now because Dovecot won't have
 	    # permission later.
-	    cp conf/sieve-spam.txt /etc/dovecot/sieve-spam.sieve
+	    cp $APWD/conf/sieve-spam.txt /etc/dovecot/sieve-spam.sieve
 	    sievec /etc/dovecot/sieve-spam.sieve
 
 	    # ### Permissions

distros/debian12/install_webmail.sh

@@ -42,7 +42,7 @@ InstallWebmail() {
     fi
 
     # Log configuration details
-    cat >> /home/administrator/wtlinux_server_setup/wtserver_configuration.txt <<EOF
+    cat >> /home/$SUDO_USER/wtlinux_server_setup/wtserver_configuration.txt <<EOF
 # $CFG_WEBMAIL Store the passwords
 #--------------------------------------------------------
 Webmail software        : $CFG_WEBMAIL
@@ -136,11 +136,11 @@ InstallRoundcubeLatest() {
     echo -e "[${green}DONE${NC}]"
 
     echo -n -e "$IDENTATION_LVL_2 Installing required PHP pear packages... "
-    pear channel-update pear.php.net
-    pear install Mail_Mime
-    pear install Auth_SASL
-    pear install Net_SMTP
-    pear install Net_IDNA2
+    pear channel-update pear.php.net >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+    pear install Mail_Mime >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+    pear install Auth_SASL2 >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+    pear install Net_SMTP >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+    pear install channel://pear.php.net/Net_IDNA2-0.2.0
     echo -e "[${green}DONE${NC}]"
     
     apt_purge_remove roundcube*
@@ -191,9 +191,7 @@ InstallRoundcubeLatest() {
     echo -e "[${green}DONE${NC}]"
 
     # Configure Roundcube on WebServer
-    echo -n -e "$IDENTATION_LVL_2 Configuring Roundcube on WebServer... "
     ConfigureRoundcubeWebServer
-    echo -e "[${green}DONE${NC}]"
 
     # Integrate Roundcube with ISPConfig
     echo -n -e "$IDENTATION_LVL_2 Integrating Roundcube with ISPConfig... "
@@ -276,7 +274,7 @@ ConfigureRoundcubeWebServer() {
 #    Configure Apache for Roundcube
 #---------------------------------------------------------------------
 ConfigureApacheForRoundcube() {
-    echo -n -e "$IDENTATION_LVL_2 Configuring Apache for Roundcube..."
+    echo -n -e "$IDENTATION_LVL_2 Configuring Apache for Roundcube... "
 
     # Backup the original Apache configuration file
     mv /etc/roundcube/apache.conf /etc/roundcube/apache.conf.default
@@ -539,12 +537,12 @@ IntegrateRoundcubeWithISPConfig() {
     rm -rf /usr/share/roundcube/installer
 
     # Fix Carddav permissions:
-    chown -R root.www-data ${RCM_PLUGIN_DIR}/carddav
+    chown -R root:www-data ${RCM_PLUGIN_DIR}/carddav
     # root.www-data need all permissions, others only read
     chmod -R 774 ${RCM_PLUGIN_DIR}/carddav
 
     ${RCM_DIR}/bin/updatedb.sh --dir ${RCM_DIR}/SQL --package roundcube
-    composer require roundcube/larry
+    #composer require roundcube/larry
 }
 
 #---------------------------------------------------------------------