wtserver 0.13

distros/debian12/askquestions.sh

@@ -132,9 +132,9 @@ AskQuestions() {
     echo
 
     if (whiptail --title "Update Freshclam DB" --backtitle "$WT_BACKTITLE" --yesno "You want to update Antivirus Database during install?" $WT_HEIGHT $WT_WIDTH); then
-        CFG_AVUPDATE=true
+        CFG_AVUPDATE="yes"
     else
-        CFG_AVUPDATE=false
+        CFG_AVUPDATE="no"
     fi
 
     echo -n -e "$IDENTATION_LVL_1 ${BBlack}Update Antivirus Database${NC}: ${green}$CFG_AVUPDATE${NC} "
@@ -197,27 +197,27 @@ AskQuestions() {
     done
 
     if (whiptail --title "Quota" --backtitle "$WT_BACKTITLE" --yesno "Setup user quota?" $WT_HEIGHT $WT_WIDTH); then
-        CFG_QUOTA=true
+        CFG_QUOTA="yes"
     else
-        CFG_QUOTA=false
+        CFG_QUOTA="no"
     fi
 
     echo -n -e "$IDENTATION_LVL_1 ${BBlack}Setup Quota${NC}: ${green}$CFG_QUOTA${NC} "
     echo
 
     if (whiptail --title "Jailkit" --backtitle "$WT_BACKTITLE" --yesno "Would you like to install Jailkit?" $WT_HEIGHT $WT_WIDTH); then
-        CFG_JKIT=true
+        CFG_JKIT="yes"
     else
-        CFG_JKIT=false
+        CFG_JKIT="no"
     fi
 
     echo -n -e "$IDENTATION_LVL_1 ${BBlack}Install Jailkit${NC}: ${green}$CFG_JKIT${NC} "
     echo
 
     if (whiptail --title "WebStats" --backtitle "$WT_BACKTITLE" --yesno "Would you like to install WebStats?" $WT_HEIGHT $WT_WIDTH); then
-        CFG_WEBSTATS=true
+        CFG_WEBSTATS="yes"
     else
-        CFG_WEBSTATS=false
+        CFG_WEBSTATS="no"
     fi
 
     echo -n -e "$IDENTATION_LVL_1 ${BBlack}Install WebStats${NC}: ${green}$CFG_WEBSTATS${NC} "

distros/debian12/install_extraphp.sh

@@ -145,6 +145,7 @@ apt_install php7.3 php7.3-cli php7.3-cgi php7.3-fpm php7.3-gd php7.3-mysql php7.
 
 OS_default_PHP_back
 echo -e "[${green}DONE${NC}]"
+}
 
 InstallPhp74() {
 ### Install PHP 7.4.33
@@ -155,6 +156,7 @@ apt_install php7.4 php7.4-cli php7.4-cgi php7.4-fpm php7.4-gd php7.4-mysql php7.
 
 OS_default_PHP_back
 echo -e "[${green}DONE${NC}]"
+}
 
 InstallPhp80() {
 ### Install PHP 8.0.30

distros/debian12/install_owncloud.sh

@@ -19,10 +19,10 @@ InstallCloud() {
     # Generate SSL certificate
     systemctl stop nginx
     if [ "$CFG_SSL_NEW" == "yes" ]; then
-	sh  /root/.acme.sh/acme.sh --issue --standalone -d cloud.$CFG_HOSTNAME_DOMAIN --force
+	sh  /root/.acme.sh/acme.sh --issue --standalone -d cloud.$CFG_HOSTNAME_DOMAIN --force  >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
     else
 	#cp -av /home/administrator/wtlinux_server_setup/acme_ssl/arbajnok/cloud.$CFG_HOSTNAME_DOMAIN ~/.acme.sh/
-	cp -av /home/$SUDO_USER/wtlinux_server_setup/acme_ssl/$CFG_HOSTNAME_DOMAIN/cloud.$CFG_HOSTNAME_DOMAIN /root/.acme.sh/
+	cp -av /home/$SUDO_USER/wtlinux_server_setup/acme_ssl/$CFG_HOSTNAME_DOMAIN/cloud.$CFG_HOSTNAME_DOMAIN /root/.acme.sh/ >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
     fi
 
     systemctl restart nginx
@@ -123,7 +123,7 @@ InstallNextcloud() {
     else
 	InstallNextcloudVer $owncloud_ver $owncloud_hash
     fi
-
+    
     # Configure Nextcloud permissions
     cat >> ./nextcloud_permissions.sh <<EOF
 #!/bin/bash
@@ -182,10 +182,10 @@ EOF
     case $CFG_CLOUDDBTYPE in
 	"mysql")
 	    if [ $CFG_CLOUDDBHOST == "localhost" ]; then
-		mysql -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "CREATE DATABASE $CFG_CLOUDDBNAME" > /dev/null 2>&1
+		mariadb -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "CREATE DATABASE $CFG_CLOUDDBNAME" > /dev/null 2>&1
 		#mysql -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "CREATE DATABASE $CFG_CLOUDDBNAME CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" > /dev/null 2>&1
-		mysql -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "USE $CFG_CLOUDDBNAME" > /dev/null 2>&1
-		mysql -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'localhost' IDENTIFIED BY '$CFG_CLOUDDBPWD'" > /dev/null 2>&1
+		mariadb -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "USE $CFG_CLOUDDBNAME" > /dev/null 2>&1
+		mariadb -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'localhost' IDENTIFIED BY '$CFG_CLOUDDBPWD'" > /dev/null 2>&1
 		mysql -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "flush privileges;" > /dev/null 2>&1
 	    else
 		mysql -u $dbruser -p$CFG_MYSQL_ROOT_PWD -h $CFG_CLOUDDBHOST -e "CREATE DATABASE $CFG_CLOUDDBNAME" > /dev/null 2>&1

distros/debian12/install_phpmyadmin.sh

@@ -95,7 +95,6 @@ server {
    listen 80;
    server_name "";
    root /usr/share/phpmyadmin;
-
    location /phpmyadmin {
                root /usr/share/;
                index index.php index.html index.htm;
@@ -103,7 +102,7 @@ server {
                        try_files $uri =404;
                        root /usr/share/;
                        fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
-                       fast_cgi_param HTTPS $https;
+                       fastcgi_param HTTPS $https;
                        fastcgi_index index.php;
                        fastcgi_param SCRIPT_FILENAME $request_filename;
                        include /etc/nginx/fastcgi_params;
@@ -125,44 +124,40 @@ server {
    location / {
       index index.php;
    }
-
 ## Images and static content is treated different
    location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml)$ {
       access_log off;
       expires 30d;
    }
-
    location ~ /\.ht {
       deny all;
    }
-
    location ~ /(libraries|setup/frames|setup/libs) {
       deny all;
       return 404;
    }
-
    location ~ \.php$ {
       include /etc/nginx/fastcgi_params;
-      fastcgi_pass 127.0.0.1:9000;
+      fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
       fastcgi_index index.php;
-      fastcgi_param SCRIPT_FILENAME /usr/share/phpMyAdmin$fastcgi_script_name;
+      fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
    }
 }
 EOF
 
-        #echo -n -e "$IDENTATION_LVL_2 Disabling IPv6 if not enabled... "
+        echo -n -e "$IDENTATION_LVL_2 Disabling IPv6 if not enabled... "
         # Disable IPv6 if not enabled
-	#if [ $IPV6_ENABLED == false ]; then
-	#    sed -i "s/listen \[::\]:80/###-No IPV6### listen [::]:80/" /etc/nginx/sites-available/default
-	#fi
-	#echo -e "[${green}DONE${NC}]"
+	if [ $IPV6_ENABLED == false ]; then
+	    sed -i "s/listen \[::\]:80/###-No IPV6### listen [::]:80/" /etc/nginx/sites-available/default
+	fi
+	echo -e "[${green}DONE${NC}]"
 
-        #echo -n -e "$IDENTATION_LVL_2 Ensuring sites-enabled loading... "
+        echo -n -e "$IDENTATION_LVL_2 Ensuring sites-enabled loading... "
         # Ensure sites-enabled loading
-	#if [ $IPV6_ENABLED == false ]; then
-	#    grep -q "sites-enabled\/\*\.vhost" /etc/nginx/nginx.conf || sed -i "/include \/etc\/nginx\/conf.d\/\*\.conf;/ a \    include \/etc\/nginx\/sites-enabled\/\*\.vhost;" /etc/nginx/nginx.conf
-	#fi
-	#echo -e "[${green}DONE${NC}]"
+	if [ $IPV6_ENABLED == false ]; then
+	    grep -q "sites-enabled\/\*\.vhost" /etc/nginx/nginx.conf || sed -i "/include \/etc\/nginx\/conf.d\/\*\.conf;/ a \    include \/etc\/nginx\/sites-enabled\/\*\.vhost;" /etc/nginx/nginx.conf
+	fi
+	echo -e "[${green}DONE${NC}]"
 
 	#write vhost nginx phpmyadmin file for ISPConfig vhost
 	# uncommmenting the phpmyadmin section

distros/debian12/install_webmail.sh

@@ -29,9 +29,9 @@ InstallWebmail() {
     # Stop Nginx to configure SSL
     systemctl stop nginx
     if [ "$CFG_SSL_NEW" == "yes" ]; then
-	sh /home/$SUDO_USER/.acme.sh/acme.sh --issue --standalone -d webmail.$CFG_HOSTNAME_DOMAIN --force
+	sh /home/$SUDO_USER/.acme.sh/acme.sh --issue --standalone -d webmail.$CFG_HOSTNAME_DOMAIN --force >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
     else
-	cp -av /home/$SUDO_USER/wtlinux_server_setup/acme_ssl/$CFG_HOSTNAME_DOMAIN/webmail.$CFG_HOSTNAME_DOMAIN /home/$SUDO_USER/.acme.sh/
+	cp -av /home/$SUDO_USER/wtlinux_server_setup/acme_ssl/$CFG_HOSTNAME_DOMAIN/webmail.$CFG_HOSTNAME_DOMAIN /home/$SUDO_USER/.acme.sh/ >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
     fi
 
     # Restart the appropriate web server
@@ -165,13 +165,13 @@ InstallRoundcubeLatest() {
 	mv /usr/local/lib/roundcubemail-$VERSION/ $RCM_DIR
 	rm -f /tmp/roundcube.tgz
 	echo -e "[${green}DONE${NC}]"
-
+    fi
     # Configure Roundcube database
     echo -e "$IDENTATION_LVL_2 Configuring Roundcube database... "
-    mysql -uroot -p$CFG_MYSQL_ROOT_PWD -e "CREATE DATABASE ${CFG_ROUNDCUBE_DB}" > /dev/null 2>&1
-    mysql -uroot -p$CFG_MYSQL_ROOT_PWD -e "GRANT ALL PRIVILEGES ON ${CFG_ROUNDCUBE_DB}.* TO ${CFG_ROUNDCUBE_USR}@localhost IDENTIFIED BY '$CFG_ROUNDCUBE_PWD'" > /dev/null 2>&1
-    mysql -uroot -p$CFG_MYSQL_ROOT_PWD -e "flush privileges;" > /dev/null 2>&1
-    mysql -uroot -p"$CFG_MYSQL_ROOT_PWD" ${CFG_ROUNDCUBE_DB} < /usr/share/roundcube/SQL/mysql.initial.sql
+    mariadb -uroot -p$CFG_MYSQL_ROOT_PWD -e "CREATE DATABASE ${CFG_ROUNDCUBE_DB}" > /dev/null 2>&1
+    mariadb -uroot -p$CFG_MYSQL_ROOT_PWD -e "GRANT ALL PRIVILEGES ON ${CFG_ROUNDCUBE_DB}.* TO ${CFG_ROUNDCUBE_USR}@localhost IDENTIFIED BY '$CFG_ROUNDCUBE_PWD'" > /dev/null 2>&1
+    mariadb -uroot -p$CFG_MYSQL_ROOT_PWD -e "flush privileges;" > /dev/null 2>&1
+    mariadb -uroot -p"$CFG_MYSQL_ROOT_PWD" ${CFG_ROUNDCUBE_DB} < /usr/share/roundcube/SQL/mysql.initial.sql
     cp -pf /usr/share/roundcube/config/config.inc.php.sample /usr/share/roundcube/config/config.inc.php
     CFG_ROUNDCUBE_PRODUCTNAME=$(echo "$CFG_HOSTNAME_DOMAIN" | cut -d. -f1 | sed 's/\b\(.\)/\u\1/g')
     sed -i "s/\$config\['product_name'\] = 'Roundcube Webmail';/\$config\['product_name'\] = '$CFG_ROUNDCUBE_PRODUCTNAME Webmail';/" /usr/share/roundcube/config/config.inc.php

distros/debian12/install_webserver.sh

@@ -364,7 +364,7 @@ EOF
     ######echo extension=/usr/lib/php/20170718/mcrypt.so > /etc/php/8.2/apache2/conf.d/mcrypt.ini
 
     #phpenmod mcrypt
-    phpenmod mbstring
+    phpenmod mbstring >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
     echo -e "[${green}DONE${NC}]"
 
     if [ "$CFG_CERTBOT_VERSION" != "none" ]; then

install.sh

@@ -182,6 +182,7 @@ source $APWD/distros/$DISTRO/install_fix.sh
 source $APWD/distros/$DISTRO/install_sync.sh
 source $APWD/distros/$DISTRO/install_extraphp.sh
 source $APWD/distros/$DISTRO/install_joomla.sh
+source $APWD/distros/$DISTRO/install_letsencrypt.sh
 
 echo -e " [ ${green}DONE${NC} ] "
 
@@ -325,7 +326,7 @@ if [ -f /etc/debian_version ]; then
 
 	if [ "$CFG_SETUP_WEB" == "yes" ] || [ "$CFG_MULTISERVER" == "no" ]; then
 		InstallWebServer
-		if [ "$CFG_FTP" == "yes" ]; then
+		if [ "$CFG_FTP" != "none" ]; then
 			InstallFTP
 		fi
 		if [ "$CFG_QUOTA" == "yes" ]; then