wtserver 0.15

distros/debian12/install_extraphp.sh

@@ -207,7 +207,7 @@ InstallPhp84() {
 ### https://www.howtoforge.com/ispconfig-php-debian/
 echo -n -e "$IDENTATION_LVL_2 Installing PHP 8.4.4 and Modules... "
 
-apt_install php8.4 php8.4-cli php8.4-cgi php8.4-fpm php8.4-gd php8.4-mysql php8.4-imap php8.4-curl php8.4-intl php8.4-pspell php8.4-sqlite3 php8.4-tidy php8.4-xsl php8.4-zip php8.4-mbstring php8.4-soap php8.4-opcache libonig5 php8.4-common php8.4-readline php8.4-xmlbuild-essential libxml2-dev libxslt1-dev
+apt_install php8.4 php8.4-cli php8.4-cgi php8.4-fpm php8.4-gd php8.4-mysql php8.4-imap php8.4-curl php8.4-intl php8.4-pspell php8.4-sqlite3 php8.4-tidy php8.4-xsl php8.4-zip php8.4-mbstring php8.4-soap php8.4-opcache libonig5 php8.4-common php8.4-readline php8.4-xml
 
 OS_default_PHP_back
 echo -e "[${green}DONE${NC}]"

distros/debian12/install_ftp.sh

@@ -12,7 +12,7 @@ InstallFTP() {
     return
   fi
 
-  echo -e "$IDENTATION_LVL_1 Setting Virtual Chroot to ${BBlack}true${NC}... "
+  echo -n -e "$IDENTATION_LVL_1 Setting Virtual Chroot to ${BBlack}true${NC}... "
   echo "pure-ftpd-common pure-ftpd/virtualchroot boolean true" | debconf-set-selections
   echo -e "[${green}DONE${NC}]"
 
@@ -21,22 +21,24 @@ InstallFTP() {
   sed -i 's/ftp/\#ftp/' /etc/inetd.conf >>"$PROGRAMS_INSTALL_LOG_FILES" 2>&1
   echo -e " [${green}DONE${NC}]"
 
-  echo -e "$IDENTATION_LVL_1 Configuring PureFTPd to accept "
+  echo -n -e "$IDENTATION_LVL_1 Configuring PureFTPd to accept "
   case "$CFG_FTP" in
-    "onlyFTP") echo -e "${red}FTP Only${NC}"; echo 0 >/etc/pure-ftpd/conf/TLS ;;
-    "onlyTLS") echo -e "${red}TLS Only${NC}"; echo 2 >/etc/pure-ftpd/conf/TLS ;;
-    *) echo -e "${red}Both FTP and TLS${NC}"; echo 1 >/etc/pure-ftpd/conf/TLS ;;
+    "onlyFTP") echo -n -e "${red}FTP Only${NC}"; echo 0 >/etc/pure-ftpd/conf/TLS ;;
+    "onlyTLS") echo -n -e "${red}TLS Only${NC}"; echo 2 >/etc/pure-ftpd/conf/TLS ;;
+    *) echo -n -e "${red}Both FTP and TLS${NC}"; echo 1 >/etc/pure-ftpd/conf/TLS ;;
   esac
   echo -e "connections [${green}DONE${NC}]"
 
-  echo -e "$IDENTATION_LVL_1 Generating and Installing SSL Certificate for FTP Server... "
+  echo -n -e "$IDENTATION_LVL_1 Generating and Installing SSL Certificate for FTP Server... "
   mkdir -p /etc/ssl/private/ >>"$PROGRAMS_INSTALL_LOG_FILES" 2>&1
-  openssl dhparam -out /etc/ssl/private/pure-ftpd-dhparams.pem 4096 >>"$PROGRAMS_INSTALL_LOG_FILES" 2>&1
-  openssl req -x509 -nodes -days 7300 -newkey rsa:4096 -keyout /etc/ssl/private/pure-ftpd.pem -out /etc/ssl/private/pure-ftpd.pem -subj "/C=$SSL_COUNTRY/ST=$SSL_STATE/L=$SSL_LOCALITY/O=$SSL_ORGANIZATION/OU=$SSL_ORGUNIT/CN=$CFG_HOSTNAME_FQDN" >>"$PROGRAMS_INSTALL_LOG_FILES" 2>&1
+  openssl dhparam -out /etc/ssl/private/pure-ftpd-dhparams.pem 2048 >/dev/null 2>&1
+  #openssl dhparam -out /etc/ssl/private/pure-ftpd-dhparams.pem 4096 >/dev/null 2>&1
+  openssl req -x509 -nodes -days 7300 -newkey rsa:2048 -keyout /etc/ssl/private/pure-ftpd.pem -out /etc/ssl/private/pure-ftpd.pem -subj "/C=$SSL_COUNTRY/ST=$SSL_STATE/L=$SSL_LOCALITY/O=$SSL_ORGANIZATION/OU=$SSL_ORGUNIT/CN=$CFG_HOSTNAME_FQDN" >/dev/null 2>&1  
+  #openssl req -x509 -nodes -days 7300 -newkey rsa:4096 -keyout /etc/ssl/private/pure-ftpd.pem -out /etc/ssl/private/pure-ftpd.pem -subj "/C=$SSL_COUNTRY/ST=$SSL_STATE/L=$SSL_LOCALITY/O=$SSL_ORGANIZATION/OU=$SSL_ORGUNIT/CN=$CFG_HOSTNAME_FQDN" >/dev/null 2>&1
   chmod 600 /etc/ssl/private/pure-ftpd.pem >>"$PROGRAMS_INSTALL_LOG_FILES" 2>&1
   echo -e "[${green}DONE${NC}]"
 
-  echo -e "$IDENTATION_LVL_1 Restarting FTP Server... "
+  echo -n -e "$IDENTATION_LVL_1 Restarting FTP Server... "
   service openbsd-inetd restart >>"$PROGRAMS_INSTALL_LOG_FILES" 2>&1
   service pure-ftpd-mysql restart >>"$PROGRAMS_INSTALL_LOG_FILES" 2>&1
   echo -e "[${green}DONE${NC}]"  

distros/debian12/install_quota.sh

@@ -17,11 +17,11 @@ InstallQuota() {
   echo -n -e "$IDENTATION_LVL_1 Initializing disk quotas (this may take a while)... "
 
   # Check if Quota is supported
-  if ! grep -q 'quota' /proc/filesystems; then
-    echo -e "[${red}NOT SUPPORTED${NC}]"
-    echo -e "$IDENTATION_LVL_1 ${red}Quota is not supported on this system.${NC}"
-    return 1
-  fi
+  #if ! grep -q 'quota' /proc/filesystems; then
+  #  echo -e "[${red}NOT SUPPORTED${NC}]"
+  #  echo -e "$IDENTATION_LVL_1 ${red}Quota is not supported on this system.${NC}"
+  #  return 1
+  #fi
 
   # Configure Quota in /etc/fstab if not already configured
   if [ "$(grep -c ',usrjquota=quota.user,grpjquota=quota.group,jqfmt=vfsv0' /etc/fstab)" -eq 0 ]; then

distros/debian12/install_webserver.sh

@@ -296,14 +296,15 @@ EOF
 	    InstallphpMyAdmin
 	fi
 
-	echo -n -e "$IDENTATION_LVL_1 ${BWhite}Installing extra PHP and Modules...${NC}\n"
+	echo -n -e "$IDENTATION_LVL_1 Installing extra PHP and Modules...\n"
 	if [[ "$CFG_PHP_VERSION" == *"none"* ]]; then
 	    echo -e "No PHP version selected for installation."
 	else
 	    wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg >/dev/null 2>&1
 	    echo "deb https://packages.sury.org/php/ $(lsb_release -c -s) main" > /etc/apt/sources.list.d/php.list
 	    apt_update
-	    
+	    apt_upgrade
+
 	    #if [[ "$CFG_PHP_VERSION" == *"php5.5"* ]]; then
 		#InstallPhp55
 	    #fi