Reset branch in installer after merge

Reviewed-on: https://git.ictmaatwerk.com/VPS-scripts/Web-V2/pulls/11

AppendCMS.sh

@@ -4,11 +4,19 @@
 
 if [ ! -f "/etc/ICTM/selopts.list" ] || [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
 
-
 source /etc/ICTM/selopts.list
 source /etc/ICTM/mainvar.list
-rm /tmp/apt.list
-source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/ModulesMenu.list)
+if [ -z $shortdist ] ; then source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/MicroOSDetect.sh) ; fi
+if [ $webserv != nginx_nonphp ]; then
+    if [ ! -f "/etc/ICTM/phpvar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GeneratePhplist.sh) ; fi
+    source /etc/ICTM/phpvar.list
+fi
+if [ $webserv = apache ]; then
+    if [ ! -f "/etc/ICTM/apachevar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GenerateApacheList.sh) ; fi
+    source /etc/ICTM/apachevar.list
+fi
+rm /tmp/pkg.list > $OUTPUT 2>&1
+source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list)
 
 #Setting Menulist to webserver
 declare -n CMSL="$webserv"CMSL
@@ -109,8 +117,8 @@ if [ $IMODE = l ]; then
     done
     read -p "Set sitename to ${domain//./_}? (y/n)" choice
     case "$choice" in
-      y|Y ) sitename=${domain//./_};;
-      n|N ) echo "";
+      y*|Y* ) sitename=${domain//./_};;
+      n*|N* ) echo "";
       while true; do
       echo "Please enter sitename, Must NOT contain special characters, except: _";read sitename
       if [[ $sitename == *['!'@#\$%^\&*()+,.]* ]] || [ -z "$sitename" ]
@@ -152,15 +160,24 @@ CMS="${CMS//:}" && CMS="${CMS,,}"
 ##-----------##
 #   AptList   #
 ##-----------##
+msg "        Generating apt list for CMS"
 
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/apt.list >>/tmp/apt.list; then
-    curl "$repo"/raw/branch/"$branch"/CMS/"$CMS"/apt.list >>/tmp/apt.list
-    printf " " >>/tmp/apt.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list; then
+    curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list
+    printf " " >>/tmp/pkg.list
+fi
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$PKGLIST".pkg.list; then
+    curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$PKGLIST".pkg.list >>/tmp/pkg.list
+    printf " " >>/tmp/pkg.list
 fi
 
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/"$webserv"-apt.list; then
-    curl "$repo"/raw/branch/"$branch"/CMS/"$CMS"/"$webserv"-apt.list >>/tmp/apt.list
-    printf " " >>/tmp/apt.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list; then
+    curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
+    printf " " >>/tmp/pkg.list
+fi
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-"$PKGLIST".pkg.list; then
+    curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-"$PKGLIST".pkg.list >>/tmp/pkg.list
+    printf " " >>/tmp/pkg.list
 fi
 
 
@@ -169,17 +186,17 @@ fi
 ##-----------##
 
 msg "           Running preconf for Webserv"
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/appendCMS-preconf.sh; then
-    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/appendCMS-preconf.sh)
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/appendCMS-preconf.sh; then
+    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/appendCMS-preconf.sh)
 fi
 
 msg "            Running preconf for CMS"
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/preconf.sh; then
-    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/"$CMS"/preconf.sh)
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/preconf.sh; then
+    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/preconf.sh)
 fi
 
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/"$webserv"-preconf.sh; then
-    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/"$CMS"/"$webserv"-preconf.sh)
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-preconf.sh; then
+    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-preconf.sh)
 fi
 
 
@@ -187,9 +204,9 @@ fi
 #   Installer   #
 ##-------------##
 
-$PKGM update
-sed -i 's/PHPver/'$phpver'/g' /tmp/apt.list
-cat /tmp/apt.list | xargs $PKGI
+$PKGUC
+sed -i 's/PHPprefix/'$phpPkgName'/g' /tmp/pkg.list
+cat /tmp/pkg.list | xargs $PKGI
 
 
 ##---------------##
@@ -197,8 +214,8 @@ cat /tmp/apt.list | xargs $PKGI
 ##---------------##
 
 msg "           Running conf for Webserv"
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/appendCMS-conf.sh; then
-    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/appendCMS-conf.sh)
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/appendCMS-conf.sh; then
+    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/appendCMS-conf.sh)
 fi
 
 if [ $sslenable = 1 ]; then
@@ -210,26 +227,38 @@ msg "                Setting up SSL"
     fi
     site_ext=ssl
     if [ $domainwww = 1 ]; then
-        certbot --"$certwebserv" certonly -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain" > $OUTPUT 2>&1
+        certsatus=$?
     elif [ $domainwww = 0 ]; then
-        certbot --"$certwebserv" certonly -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" > $OUTPUT 2>&1
+        certsatus=$?
     fi
-    if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/ssl-handler.sh; then
-        source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
+    if test $certsatus -eq 0
+    then
+        site_ext="ssl"
+    else
+        site_ext="nossl"
+        rm -rf /etc/acmesh/certs/$domain*
+    fi
+    unset certsatus
+    if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh; then
+        source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
     fi
 elif [ $sslenable = 0 ]; then
     site_ext=nossl
 fi
 
-wget -q -t7 "$repo"/raw/branch/"$branch"/Scripts/EnableSSL.sh -O ~/activateSSL-$domain.sh
-sed -i -e 's/DOMAINname/'$domain'/' -e 's/CONFname/'$sitename'/' -e 's/DomainWWW/'$domainwww'/' -e 's/Email/'$email'/' -e 's/WebServer/'$webserv'/' ~/activateSSL-$domain.sh
+if [ $site_ext = nossl ]; then
+    curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/EnableSSL.sh -o ~/activateSSL-$domain.sh
+    sed -i -e 's/DOMAINname/'$domain'/' -e 's/CONFname/'$sitename'/' -e 's/DomainWWW/'$domainwww'/' -e 's/Email/'$email'/' -e 's/WebServer/'$webserv'/' ~/activateSSL-$domain.sh
+fi
 
 msg "              Running conf for CMS"
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/conf.sh; then
-    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/"$CMS"/conf.sh)
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/conf.sh; then
+    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/conf.sh)
 fi
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/"$webserv"-conf.sh; then
-    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/"$CMS"/"$webserv"-conf.sh)
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-conf.sh; then
+    source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-conf.sh)
 fi
 
 ##--------------------------##
@@ -253,4 +282,4 @@ systemctl reload fail2ban
 ##-------##
 
 msg "                Added CMS!"
-for f in /etc/update-motd.d/51*; do bash $f; done
+if stat --printf='' /etc/update-motd.d/51* 2>/dev/null; then for f in /etc/update-motd.d/51*; do bash $f; done; fi

AppendModule.sh

@@ -4,15 +4,23 @@
 
 if [ ! -f "/etc/ICTM/selopts.list" ] || [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
 
-
 ##-----------------##
 #   Fetching Vars   #
 ##-----------------##
 
 source /etc/ICTM/selopts.list
 source /etc/ICTM/mainvar.list
-rm /tmp/apt.list
-source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/ModulesMenu.list)
+if [ -z $shortdist ] ; then source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/MicroOSDetect.sh) ; fi
+if [ $webserv != nginx_nonphp ]; then
+    if [ ! -f "/etc/ICTM/phpvar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GeneratePhplist.sh) ; fi
+    source /etc/ICTM/phpvar.list
+fi
+if [ $webserv = apache ]; then
+    if [ ! -f "/etc/ICTM/apachevar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GenerateApacheList.sh) ; fi
+    source /etc/ICTM/apachevar.list
+fi
+rm /tmp/pkg.list
+source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list)
 
 #Setting Menulist to webserver
 declare -n CMSL="$webserv"CMSL
@@ -85,7 +93,7 @@ fi
 
 if [ $IMODE = n ]; then
 	PasswordQuest
-	option=$(whiptail --title "Title" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3)
+	option=$(whiptail --title "Config" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3)
 	[[ "$?" = 1 ]] && msg "              Quiting installer" 8 78 && exit;
 fi
 
@@ -150,29 +158,44 @@ option="$option""$aonoption"
 
 msg "        Generating apt list for Options"
 for val1 in ${option[*]}; do
-    echo "$val1" #TMP
-    modListed=$(wget -t7 -qO - "$repo"/raw/branch/master/extModules.list|grep "$val1")
+    modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
     #Checking
     if test -z "$modListed"
     then
         #Fetching from local repo
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/SubModules/"$val1"/apt.list; then
-           curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/SubModules/"$val1"/apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/generic.pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/SubModules/"$val1"/"$webserv"-apt.list; then
-           curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/SubModules/"$val1"/"$webserv"-apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-generic.pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
+        fi
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$PKGLIST".pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$PKGLIST".pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
+        fi
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-"$PKGLIST".pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-"$PKGLIST".pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
     else
         #Fetching from remote repo
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"apt.list; then
-           curl --retry 7 --retry-delay 5 -s "$modListed"apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"generic.pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$modListed"generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$webserv"-apt.list; then
-           curl "$modListed""$webserv"-apt.list >>/tmp/apt.list
-           printf " " >>/tmp/apt.list
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$webserv"-generic.pkg.list; then
+           curl "$modListed""$webserv"-generic.pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
+        fi
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$PKGLIST".pkg.list; then
+           curl --retry 7 --retry-delay 5 -s "$modListed""$PKGLIST".pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
+        fi
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$webserv"-"$PKGLIST".pkg.list; then
+           curl "$modListed""$webserv"-"$PKGLIST".pkg.list >>/tmp/pkg.list
+           printf " " >>/tmp/pkg.list
         fi
     fi
 done
@@ -184,17 +207,17 @@ done
 
 msg "          Running preconf for Options"
 for val1 in ${option[*]}; do
-    echo "$val1" #TMP
-    modListed=$(wget -t7 -qO - "$repo"/raw/branch/master/extModules.list|grep "$val1")
+    msg "Pre-configuring  $val1"
+    modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
     #Checking
     if test -z "$modListed"
     then
         #Fetching from local repo
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/SubModules/"$val1"/preconf.sh; then
-        source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/SubModules/"$val1"/preconf.sh)
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/preconf.sh; then
+        source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/preconf.sh)
         fi
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/SubModules/"$val1"/"$webserv"-preconf.sh; then
-            source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/SubModules/"$val1"/"$webserv"-preconf.sh)
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-preconf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-preconf.sh)
         fi
     else
         #Fetching from remote repo
@@ -212,9 +235,9 @@ done
 #   Installer   #
 ##-------------##
 
-$PKGM update
-sed -i 's/PHPver/'$phpver'/g' /tmp/apt.list
-cat /tmp/apt.list | xargs $PKGI
+$PKGUC
+sed -i 's/PHPprefix/'$phpPkgName'/g' /tmp/pkg.list
+cat /tmp/pkg.list | xargs $PKGI
 
 
 ##---------------##
@@ -223,17 +246,17 @@ cat /tmp/apt.list | xargs $PKGI
 
 msg "            Running conf for Options"
 for val1 in ${option[*]}; do
-    echo "$val1" #TMP
-    modListed=$(wget -t7 -qO - "$repo"/raw/branch/master/extModules.list|grep "$val1")
+    msg "Configuring  $val1"
+    modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
     #Checking
     if test -z "$modListed" 
     then
         #Fetching from local repo
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/SubModules/"$val1"/conf.sh; then
-        source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/SubModules/"$val1"/conf.sh)
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/conf.sh; then
+        source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/conf.sh)
         fi
-        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/SubModules/"$val1"/"$webserv"-conf.sh; then
-            source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/SubModules/"$val1"/"$webserv"-conf.sh)
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-conf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/"$webserv"-conf.sh)
         fi
     else
         #Fetching from remote repo
@@ -252,4 +275,4 @@ done
 ##-------##
 
 msg "                Added Module!"
-for f in /etc/update-motd.d/51*; do bash $f; done
+if stat --printf='' /etc/update-motd.d/51* 2>/dev/null; then for f in /etc/update-motd.d/51*; do bash $f; done; fi

CMS/Backend/Fpm-Pool.conf-unconfigured

@@ -12,8 +12,8 @@ php_admin_value[post_max_size] = 16M
 php_admin_value[max_input_time] = 15                                                                                                                                                                                                                                           
 php_admin_value[cgi.fix_pathinfo] = 0                                                                                                                                                                                                                                          
 php_admin_value[allow_url_fopen] = Off                                                                                                                                                                                                                                         
-php_admin_value[file_uploads] = Off                                                                                                                                                                                                                                   
-php_admin_value[open_basedir] = /var/log/PhpMyAdmin:/usr/share/phpmyadmin:/var/lib/phpmyadmin:/etc/phpmyadmin                                                                                                                                                                                                                 
+php_admin_value[file_uploads] = On                                                                                                                                                                                                                                   
+php_admin_value[open_basedir] = /var/log/PhpMyAdmin:/usr/share/phpmyadmin:/var/lib/phpmyadmin:/etc/phpmyadmin:/tmp                                                                                                                                                                                                                 
 php_admin_value[session.use_strict_mode] = 1                                                                                                                                                                                                                                   
 php_admin_value[session.cookie_httponly] = 1                                                                                                                                                                                                                                   
 ;HTTPSONLY php_admin_value[session.cookie_samesite] = Strict                                                                                                                                                                                                                              

CMS/Backend/apache-conf.sh

@@ -1,4 +1,4 @@
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/Backend/apache-siteBackend-unconfigured -O /tmp/apache-siteconf
-sed -i -e 's/PHPver/'$phpver'/' -e 's/DOMAINname/'$hostname'/' /tmp/apache-siteconf
-sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' /etc/apache2/sites-available/Backend_"$site_ext".conf
-systemctl reload apache2
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/Backend/apache-siteBackend-unconfigured -o /tmp/apache-siteconf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$hostname'/g' /tmp/apache-siteconf
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' "$apacheConfDir"/sites-available/Backend_"$siteBackend_ext".conf
+systemctl reload $apacheService

CMS/Backend/conf.sh

@@ -1,6 +1,6 @@
 #Backend PHP Pool
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/Backend/Fpm-Pool.conf-unconfigured -O /etc/php/"$phpver"/fpm/pool.d/Backend.conf
-sed -i 's/PHPver/'$phpver'/' /etc/php/"$phpver"/fpm/pool.d/Backend.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/Backend/Fpm-Pool.conf-unconfigured -o "$phpPoolDir"/Backend.conf
+sed -i 's/PHPver/'$phpver'/' "$phpPoolDir"/Backend.conf
 groupadd Backend
 useradd -g Backend Backend
 #PHPMyAdmin configuration
@@ -8,7 +8,7 @@ touch /var/log/PhpMyAdmin/PhpMyAdmin_auth.log
 chown Backend:Backend -R /usr/share/phpmyadmin
 chown Backend:Backend -R /var/lib/phpmyadmin/tmp
 chown Backend:Backend -R /var/log/PhpMyAdmin
-systemctl reload php"$phpver"-fpm
+systemctl reload "$phpFPMService"
 #Auto disable backends at night
 echo "0 0 * * * root bash /opt/toggle/toggle-Netdata.sh -d > >/dev/null 2>&1" >> /etc/cron.d/autodisablebackend
 echo "0 0 * * * root bash /opt/toggle/toggle-PhpMyAdmin.sh -d > >/dev/null 2>&1" >> /etc/cron.d/autodisablebackend

CMS/Backend/nginx-conf.sh

@@ -1,4 +1,4 @@
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/Backend/nginx-siteBackend-unconfigured -O /tmp/nginx-backendconf
-sed -i -e 's/PHPver/'$phpver'/' -e 's/DOMAINname/'$hostname'/' /tmp/nginx-backendconf
-sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-backendconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/Backend_"$site_ext"
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/Backend/nginx-siteBackend-unconfigured -o /tmp/nginx-backendconf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$hostname'/g' /tmp/nginx-backendconf
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-backendconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/Backend_"$siteBackend_ext"
 systemctl reload nginx

CMS/nextcloud/Fpm-Pool.conf-unconfigured

@@ -4,7 +4,7 @@ group = SITEname
 listen = /var/run/php/phpPHPver-fpm-SITEname.sock
 listen.owner = www-data
 listen.group = www-data
-php_admin_value[disable_functions] = exec,passthru,shell_exec,system
+php_admin_value[disable_functions] = exec,passthru,system
 php_admin_value[error_log] = /var/log/php-fpm/error-SITEname.log
 ; OPCACHE SETTINGS
 php_admin_value[opcache.memory_consumption] = 256

CMS/nextcloud/apache-conf.sh

@@ -1,11 +1,11 @@
 #Apache
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/Apache-unconfigured -O /tmp/apache-siteconf
-sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/apache-siteconf
-sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' /etc/apache2/sites-available/"$sitename"_"$site_ext".conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/Apache-unconfigured -o /tmp/apache-siteconf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/g' -e 's/SITEname/'$sitename'/g' /tmp/apache-siteconf
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' "$apacheConfDir"/sites-available/"$sitename"_"$site_ext".conf
 chown "$sitename":"$sitename" -R /var/www/"$domain"/html
 
 #PHP
-sed -i -e '/cgi.fix_pathinfo/c\php_admin_value[cgi.fix_pathinfo] = 1' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf
-sed -i -e '/security.limit_extensions/c\php_admin_value[security.limit_extensions] = .php' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf
+sed -i -e '/cgi.fix_pathinfo/c\php_admin_value[cgi.fix_pathinfo] = 1' "$phpPoolDir"/$sitename.conf
+sed -i -e '/security.limit_extensions/c\php_admin_value[security.limit_extensions] = .php' "$phpPoolDir"/$sitename.conf
 
-systemctl reload apache2 php$phpver-fpm
+systemctl reload $apacheService $phpFPMService

CMS/nextcloud/apt.list

@@ -1 +0,0 @@
-libmagickcore-6.q16-3-extra libxml2 openssl zlib1g libpng-dev phpPHPver-apcu phpPHPver-bcmath phpPHPver-gmp

CMS/nextcloud/apt.pkg.list

@@ -0,0 +1 @@
+libmagickcore-6.q16-3-extra zlib1g libpng-dev

CMS/nextcloud/conf.sh

@@ -1,21 +1,21 @@
 #PHP Pool
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/Fpm-Pool.conf-unconfigured -O /etc/php/"$phpver"/fpm/pool.d/"$sitename".conf
-sed -i -e 's/PHPver/'$phpver'/' -e 's/SITEname/'$sitename'/' -e 's/DOMAINname/'$domain'/' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/Fpm-Pool.conf-unconfigured -o "$phpPoolDir"/"$sitename".conf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/SITEname/'$sitename'/g' -e 's/DOMAINname/'$domain'/g' "$phpPoolDir"/$sitename.conf
 groupadd "$sitename"
 useradd -g "$sitename" "$sitename"
 mkdir -p /var/www/"$domain"/html/data
 
 #Getting Nextcloud
-wget -t7 http://mirror.nxdi.nl/resources/nextcloud/latest.tar.bz2 -O /tmp/nextcloud.tar.bz2
+curl --retry 7 --retry-delay 5 -s http://mirror.nxdi.nl/resources/nextcloud/latest.tar.bz2 -o /tmp/nextcloud.tar.bz2
 tar jxf /tmp/nextcloud.tar.bz2 -C /tmp
 cp -a /tmp/nextcloud/. /var/www/"$domain"/html
-touch /var/www/"$domain"/html/data/nextcloud.log
+touch /var/www/"$domain"/html/data/nextcloud.log > $OUTPUT 2>&1
 
 #Creating DB
 db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`
 db_name="nextcloud_$db_suffix"
 db_user="nextcloud_$db_suffix"
-db_pass=$(date +%s|sha256sum|base64|head -c 32)
+db_pass=$(tr -dc 'A-Za-z0-9!#%()*+,-.:;<=>?@[]^_{|}~' </dev/urandom | head -c 30 ; echo)
 mysql -u root -p"$password" -e "CREATE DATABASE "$db_name" DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;" > $OUTPUT 2>&1
 mysql -u root -p"$password" -e "CREATE USER '"$db_user"'@'localhost' IDENTIFIED BY '"$db_pass"';" > $OUTPUT 2>&1
 mysql -u root -p"$password" -e "GRANT ALL ON "$db_name".* TO '"$db_user"'@'localhost';" > $OUTPUT 2>&1
@@ -29,30 +29,33 @@ cat <<EOF > /var/www/$domain/html/config/autoconfig.php
   "dbname"        => "${db_name}",
   "dbuser"        => "${db_user}",
   "dbpass"        => "${db_pass}",
-  "dbhost"        => "localhost",
+  "dbhost"        => "127.0.0.1",
   "dbtableprefix" => "",
   "simpleSignUpLink.shown" => false,
   "directory"     => "/var/www/$domain/html/data",
 );
 EOF
 
+#Setting Permsissions
 chown "$sitename":"$sitename" -R /var/www/"$domain"/html
 
+if [ "$shortdist" = "el8" ]; then
+    #Setting SeLiux perms for centos
+    semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/$domain/html(/.*)?" > $OUTPUT 2>&1
+    restorecon -vr /var/www/ > $OUTPUT 2>&1
+fi
+
+
 #Makeing nextcloud Finalize script and setting login Notice
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/nextcloud-init.sh -O ~/NextcloudInit-"$sitename".sh
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/nextcloud-init.sh -o ~/NextcloudInit-"$sitename".sh
 sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/NextcloudInit-"$sitename".sh
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/MotdNextCloud -O /etc/update-motd.d/51-nextnotice
-sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-nextnotice
-chmod +x /etc/update-motd.d/51-nextnotice
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/MotdNextCloud -o /etc/update-motd.d/51-nextnotice-"${sitename//_}"
+sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-nextnotice-"${sitename//_}"
+chmod +x /etc/update-motd.d/51-nextnotice-"${sitename//_}"
 
 
-#Nextcloud logging location
-mkdir /var/log/nextcloud
-chmod 774 -R /var/log/nextcloud
-ln -s /var/www/"$domain"/html/data/nextcloud.log /var/log/nextcloud/"$sitename"
-
 #fail2ban
-wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Jails/nextcloud_unconfigured -O /etc/fail2ban/jail.d/"$sitename"-nextcloud.local
-sed -i 's/SITEname/'$sitename'/' /etc/fail2ban/jail.d/"$sitename"-nextcloud.local
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/config/fail2ban/Jails/nextcloud_unconfigured -o /etc/fail2ban/jail.d/"$sitename"-nextcloud.local
+sed -i 's/DOMain/'$domain'/' /etc/fail2ban/jail.d/"$sitename"-nextcloud.local
 
-systemctl reload php"$phpver"-fpm
+systemctl reload "$phpFPMService"

CMS/nextcloud/dnf.pkg.list

@@ -0,0 +1 @@
+ImageMagick-libs zlib libpng

CMS/nextcloud/generic.pkg.list

@@ -0,0 +1 @@
+libxml2 openssl PHPprefix-bcmath PHPprefix-gmp bzip2

CMS/nextcloud/nextcloud-init.sh

@@ -7,17 +7,18 @@ sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set default_loca
 sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set skeletondirectory --value=
 sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set memcache.local --value='\OC\Memcache\APCu'
 
-if [ "$(systemctl is-active  redis-server)" = "active" ]; then
+if [ "$(systemctl is-active  redis-server)" = "active" ] || [ "$(systemctl is-active  redis)" = "active" ]; then
     sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis'
     sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set memcache.locking --value='\OC\Memcache\Redis'
     sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set redis host --value=localhost
     sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set redis port --value=6379
 else 
-    echo "Redis not installed or running on this system" 
+    echo "Redis  running on this system" 
 fi
 
 echo "*/5  *  *  *  * SITEname	php -f /var/www/DOMAINname/html/cron.php > /dev/null 2>&1" >> /etc/crontab
-rm -f /etc/update-motd.d/51-nextnotice
+sn2=SITEname
+rm -f /etc/update-motd.d/51-nextnotice-${sn2//_}
 
 #Remove script
 while true; do

CMS/nextcloud/nginx-conf.sh

@@ -1,10 +1,10 @@
 #Nextcloud major release version
 
 #Configuring nginx
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/Nginx-unconfigured -O /tmp/nginx-siteconf
-sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/nginx-siteconf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/Nginx-unconfigured -o /tmp/nginx-siteconf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/g' -e 's/SITEname/'$sitename'/g' /tmp/nginx-siteconf
 sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/"$sitename"_"$site_ext"
-if [ $sslenable = 0 ]; then
+if [ $site_ext = nossl ]; then
   sed -i -e '/fastcgi_param HTTPS/c\#  fastcgi_param HTTPS' /etc/nginx/sites-available/"$sitename"_nossl
 fi
 

CMS/none/Apache-unconfigured

@@ -6,6 +6,7 @@ ErrorLog ${APACHE_LOG_DIR}/SITEname_error.log
 DirectoryIndex index.php index.html index.htm
 DocumentRoot /var/www/DOMAINname/html
 
+#Include snippets/apa-backendredir.conf
 
 <Directory /var/www/DOMAINname/html>
     Options Indexes FollowSymLinks MultiViews

CMS/none/Fpm-Pool.conf-unconfigured

@@ -25,7 +25,7 @@ php_admin_value[max_input_time] = 15
 php_admin_value[cgi.fix_pathinfo] = 0
 php_admin_value[allow_url_fopen] = Off
 php_admin_value[file_uploads] = Off
-php_admin_value[open_basedir] = /var/www/DOMAINname/html
+php_admin_value[open_basedir] = /var/www/DOMAINname/html:/tmp
 php_admin_value[session.use_strict_mode] = 1
 php_admin_value[session.cookie_httponly] = 1
 ;HTTPSONLY php_admin_value[session.cookie_samesite] = Strict

CMS/none/Nginx-unconfigured

@@ -11,6 +11,8 @@
     gzip_comp_level 2;
     gzip_disable "msie6";
     gzip_buffers 16 8k;
+    
+    #include snippets/ngx-backendredir.conf;
 
     location / {
         #try_files $uri $uri/ =404;

CMS/none/Nginx_nonphp-unconfigured

@@ -16,6 +16,8 @@
         #try_files $uri $uri/ =404;
         try_files $uri $uri/ /index.php$is_args$args;
         #try_files $uri $uri/ $uri.html $uri.php$is_args$query_string;
+        #'forPHP-FrondControler' try_files $uri $uri/ $uri.html /index.php$is_args$query_string;
+
     }
 
     location ~ /\.ht {

CMS/none/apache-conf.sh

@@ -1,9 +1,5 @@
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/none/Apache-unconfigured -O /tmp/apache-siteconf
-sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/apache-siteconf
-sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' /etc/apache2/sites-available/"$sitename"_"$site_ext".conf
-mkdir -p /var/www/"$domain"/html
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/none/Apache-unconfigured -o /tmp/apache-siteconf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/g' -e 's/SITEname/'$sitename'/g' /tmp/apache-siteconf
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' "$apacheConfDir"/sites-available/"$sitename"_"$site_ext".conf
 
-echo "<html><head></head><body>$webserv has been succsefully installed by the Wizard</body></html>" > /var/www/$domain/html/index.html
-
-chown "$sitename":"$sitename" -R /var/www/"$domain"/html
-systemctl reload apache2
+systemctl reload $apacheService 

CMS/none/conf.sh

@@ -1,12 +1,26 @@
+#Creating webfolder
+mkdir -p /var/www/"$domain"/html
+
+#Ceating content
+echo "<html><head></head><body>$webserv has been succsefully installed by the Wizard</body></html>" > /var/www/$domain/html/index.html
+
 #Do not generate php pool when php is not installed
 if [ $webserv != nginx_nonphp ]; then
 
 #Setup PHP Pool
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/none/Fpm-Pool.conf-unconfigured -O /etc/php/"$phpver"/fpm/pool.d/"$sitename".conf
-sed -i -e 's/PHPver/'$phpver'/' -e 's/SITEname/'$sitename'/' -e 's/DOMAINname/'$domain'/' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/none/Fpm-Pool.conf-unconfigured -o "$phpPoolDir"/"$sitename".conf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/SITEname/'$sitename'/g' -e 's/DOMAINname/'$domain'/' "$phpPoolDir"/$sitename.conf
 groupadd "$sitename"
 useradd -g "$sitename" "$sitename"
 
-systemctl reload php"$phpver"-fpm
+systemctl reload $phpFPMService
 
+#Setting Permsissions
+chown "$sitename":"$sitename" -R /var/www/"$domain"/html
+fi
+
+if [ "$shortdist" = "el8" ]; then
+    #Setting SeLiux perms for centos
+    semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/$domain/html(/.*)?" > $OUTPUT 2>&1
+    restorecon -vr /var/www/ > $OUTPUT 2>&1
 fi

CMS/none/nginx-conf.sh

@@ -1,9 +1,5 @@
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/none/Nginx-unconfigured -O /tmp/nginx-siteconf
-sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/nginx-siteconf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/none/Nginx-unconfigured -o /tmp/nginx-siteconf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/g' -e 's/SITEname/'$sitename'/g' /tmp/nginx-siteconf
 sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/"$sitename"_"$site_ext"
-mkdir -p /var/www/"$domain"/html
 
-echo "<html><head></head><body>$webserv has been succsefully installed by the Wizard</body></html>" > /var/www/$domain/html/index.html
-
-chown "$sitename":"$sitename" -R /var/www/"$domain"/html
 systemctl reload nginx

CMS/none/nginx_nonphp-conf.sh

@@ -1,9 +1,5 @@
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/none/Nginx_nonphp-unconfigured -O /tmp/nginx-siteconf
-sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/nginx-siteconf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/none/Nginx_nonphp-unconfigured -o /tmp/nginx-siteconf
+sed -i -e 's/DOMAINname/'$domain'/g' -e 's/SITEname/'$sitename'/g' /tmp/nginx-siteconf
 sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/"$sitename"_"$site_ext"
-mkdir -p /var/www/"$domain"/html
 
-echo "<html><head></head><body>$webserv has been succsefully installed by the Wizard</body></html>" > /var/www/$domain/html/index.html
-
-chown www-data:www-data -R /var/www/"$domain"/html
 systemctl reload nginx

CMS/wordpress/Apache-unconfigured

@@ -6,6 +6,7 @@ ErrorLog ${APACHE_LOG_DIR}/SITEname_error.log
 DirectoryIndex index.php index.html index.htm
 DocumentRoot /var/www/DOMAINname/html
 
+#Include snippets/apa-backendredir.conf
 
 <Directory /var/www/DOMAINname/html>
     Options FollowSymLinks

CMS/wordpress/Fpm-Pool.conf-unconfigured

@@ -25,7 +25,7 @@ php_admin_value[max_input_time] = 30
 php_admin_value[cgi.fix_pathinfo] = 0
 php_admin_value[allow_url_fopen] = Off
 php_admin_value[file_uploads] = on
-php_admin_value[open_basedir] = "/var/www/DOMAINname/html"
+php_admin_value[open_basedir] = /var/www/DOMAINname/html:/tmp
 php_admin_value[session.use_strict_mode] = 1
 php_admin_value[session.cookie_httponly] = 1
 ;HTTPSONLY php_admin_value[session.cookie_samesite] = Strict

CMS/wordpress/Nginx-unconfigured

@@ -12,7 +12,8 @@ gzip_types text/plain text/css text/xml text/javascript application/javascript a
 gzip_comp_level 2;
 gzip_disable "msie6";
 gzip_buffers 16 8k;
-	
+
+#include snippets/ngx-backendredir.conf;	
 
 location / {
     try_files $uri $uri/ /index.php$is_args$args;

CMS/wordpress/WordPress-unconfigured

@@ -2,7 +2,7 @@
 define('DB_NAME', 'DBName');
 define('DB_USER', 'DBUser');
 define('DB_PASSWORD', 'DBPass');
-define('DB_HOST', 'localhost');
+define('DB_HOST', '127.0.0.1');
 define('DB_CHARSET', 'utf8');
 define('DB_COLLATE', '');
 #define( 'WP_SITEURL', '' );
@@ -25,8 +25,6 @@ define('FS_METHOD','direct');
 #$table_prefix = 'DBName';
 $table_prefix = 'wp';
 
-WPsalty
-
 define('WP_DEBUG', false);
 if ( !defined('ABSPATH') )
 	define('ABSPATH', dirname(__FILE__) . '/');
@@ -39,4 +37,4 @@ if ( !defined('ABSPATH') )
 #define('WP_REDIS_HOST', '127.0.0.1');
 #define('WP_REDIS_PASSWORD', '<RedisPassword>');
 #define('WP_REDIS_PORT', '6379');
-require_once(ABSPATH . 'wp-settings.php');
+

CMS/wordpress/apache-conf.sh

@@ -1,6 +1,6 @@
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/Apache-unconfigured -O /tmp/apache-siteconf
-sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/apache-siteconf
-sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' /etc/apache2/sites-available/"$sitename"_"$site_ext".conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/Apache-unconfigured -o /tmp/apache-siteconf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/g' -e 's/SITEname/'$sitename'/g' /tmp/apache-siteconf
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' "$apacheConfDir"/sites-available/"$sitename"_"$site_ext".conf
 
 chown "$sitename":"$sitename" -R /var/www/"$domain"/html
-systemctl reload apache2 php$phpver-fpm
+systemctl reload $apacheService $phpFPMService

CMS/wordpress/conf.sh

@@ -1,7 +1,7 @@
 #WP-CLI
 if [ ! -f /usr/local/bin/wp ]; then
-   wget -q -t7 https://raw.githubusercontent.com/wp-cli/wp-cli/v2.4.0/utils/wp-completion.bash -O  /etc/bash_completion.d/wp
-   wget -q -t7 https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -O /usr/local/bin/wp
+   curl --retry 7 --retry-delay 5 -s https://raw.githubusercontent.com/wp-cli/wp-cli/v2.4.0/utils/wp-completion.bash -o /etc/bash_completion.d/wp
+   curl --retry 7 --retry-delay 5 -s https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -o /usr/local/bin/wp
    chmod +x /usr/local/bin/wp
 fi
 
@@ -9,8 +9,8 @@ fi
 db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`
 db_name="wp_$db_suffix"
 db_user="wp_$db_suffix"
-db_pass=$(date +%s|sha256sum|base64|head -c 32)
-WPSalts=$(wget https://api.wordpress.org/secret-key/1.1/salt/ -q -O -)
+db_pass=$(tr -dc 'A-Za-z0-9!#%()*+,-.:;<=>?@[]^_{|}~' </dev/urandom | head -c 30 ; echo)
+WPSalts=$(curl --retry 7 --retry-delay 5 -s https://api.wordpress.org/secret-key/1.1/salt/)
 
 #Setting up Database
 mysql -u root -p"$password" -e "CREATE DATABASE "$db_name" DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;" > $OUTPUT 2>&1
@@ -22,34 +22,44 @@ mysql -u root -p"$password" -e "FLUSH PRIVILEGES;" > $OUTPUT 2>&1
 mkdir -p /var/www/"$domain"/html
 
 #Getting WordPress
-wget -q -t7 http://mirror.nxdi.nl/resources/wordpress/latest.tar.gz -O /tmp/wp.tar.gz
+curl --retry 7 --retry-delay 5 -s http://mirror.nxdi.nl/resources/wordpress/latest.tar.gz -o /tmp/wp.tar.gz
 tar -C /var/www/"$domain"/html -xzf /tmp/wp.tar.gz --strip 1
 rm /var/www/"$domain"/html/wp-config-sample.php 
 
 #Configuring WordPress
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/WordPress-unconfigured -O /var/www/"$domain"/html/wp-config.php
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/WordPress-unconfigured -o /var/www/"$domain"/html/wp-config.php
 sed -i -e 's/DBPass/'$db_pass'/' -e 's/DBUser/'$db_user'/'  -e 's/DBName/'$db_name'/' -e 's/DOMAINname/'$domain'/' /var/www/"$domain"/html/wp-config.php
-printf '%s\n' "g/WPsalty/d" a "$WPSalts" . w | ed -s /var/www/"$domain"/html/wp-config.php
+printf '%s\n' "$WPSalts" >> /var/www/"$domain"/html/wp-config.php
+printf '%s\n' "require_once(ABSPATH . 'wp-settings.php');" >> /var/www/"$domain"/html/wp-config.php
 
 #PHP Pool
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/Fpm-Pool.conf-unconfigured -O /etc/php/"$phpver"/fpm/pool.d/"$sitename".conf
-sed -i -e 's/PHPver/'$phpver'/' -e 's/SITEname/'$sitename'/' -e 's/DOMAINname/'$domain'/' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/Fpm-Pool.conf-unconfigured -o "$phpPoolDir"/"$sitename".conf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/SITEname/'$sitename'/g' -e 's/DOMAINname/'$domain'/g' "$phpPoolDir"/$sitename.conf
 groupadd "$sitename"
 useradd -g "$sitename" "$sitename"
 
-systemctl reload php"$phpver"-fpm
+systemctl reload $phpFPMService
 
 #fail2ban
 if [ ! -f /etc/fail2ban/jail.d/wordpress-syslog.local ]; then
-    wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Jails/wordpress-syslog.jail -O /etc/fail2ban/jail.d/wordpress-syslog.local
+    curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/config/fail2ban/Jails/wordpress-syslog.jail -o /etc/fail2ban/jail.d/wordpress-syslog.local
+    if [ "$shortdist" = "el8" ]; then
+        sed -i '/logpath/c\logpath = /var/log/messages' /etc/fail2ban/jail.d/wordpress-syslog.local
+    fi
 fi
 
 #Setting Permsissions
 chown "$sitename":"$sitename" -R /var/www/"$domain"/html
 
+if [ "$shortdist" = "el8" ]; then
+    #Setting SeLiux perms for centos
+    semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/$domain/html(/.*)?" > $OUTPUT 2>&1
+    restorecon -vr /var/www/ > $OUTPUT 2>&1
+fi
+
 #Makeing wordpress Finalize script and setting login Notice
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/wordpress-init.sh -O ~/WordpressInit-"$sitename".sh
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/wordpress-init.sh -o ~/WordpressInit-"$sitename".sh
 sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/WordpressInit-"$sitename".sh
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/MotdWordpress -O /etc/update-motd.d/51-wpnotice
-sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-wpnotice
-chmod +x /etc/update-motd.d/51-wpnotice
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/MotdWordpress -o /etc/update-motd.d/51-wpnotice-"${sitename//_}"
+sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-wpnotice-"${sitename//_}"
+chmod +x /etc/update-motd.d/51-wpnotice-"${sitename//_}"

CMS/wordpress/nginx-conf.sh

@@ -1,7 +1,7 @@
 #Configuring nginx
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/Nginx-unconfigured -O /tmp/nginx-siteconf
-sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/nginx-siteconf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/Nginx-unconfigured -o /tmp/nginx-siteconf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/g' -e 's/SITEname/'$sitename'/g' /tmp/nginx-siteconf
 sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/"$sitename"_"$site_ext"
 
 #Reloading Services
-systemctl reload nginx php$phpver-fpm
+systemctl reload nginx $phpFPMService

CMS/wordpress/wordpress-init.sh

@@ -1,10 +1,13 @@
-sudo -u SITEname wp --path=/var/www/DOMAINname/html core update
-sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin update --all
-sudo -u SITEname wp --path=/var/www/DOMAINname/html theme update --all
-sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin install wp-fail2ban --activate
-sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin install all-in-one-wp-migration --activate
-sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin install https://git.ictmaatwerk.com/downloads/wp/migrate.zip --activate
-rm -f /etc/update-motd.d/51-wpnotice
+sudo -u SITEname /usr/local/bin/wp --path=/var/www/DOMAINname/html core update
+sudo -u SITEname /usr/local/bin/wp --path=/var/www/DOMAINname/html theme update --all
+sudo -u SITEname /usr/local/bin/wp --path=/var/www/DOMAINname/html plugin install wp-fail2ban --activate
+sudo -u SITEname /usr/local/bin/wp --path=/var/www/DOMAINname/html plugin install all-in-one-wp-migration --activate
+sudo -u SITEname /usr/local/bin/wp --path=/var/www/DOMAINname/html plugin install https://git.ictmaatwerk.com/downloads/wp/migrate.zip --activate
+sudo -u SITEname /usr/local/bin/wp --path=/var/www/DOMAINname/html cron event run wp_update_plugins
+sudo -u SITEname /usr/local/bin/wp --path=/var/www/DOMAINname/html plugin update --all
+echo -e "\e[96m Please update all-in-one-wp-migration-unlimited plugin manually\e[39m"
+sn2=SITEname
+rm -f /etc/update-motd.d/51-wpnotice-${sn2//_}
 
 #Remove script
 while true; do

CoreModules/apache/appendCMS-conf.sh

@@ -4,19 +4,19 @@
 
 if [ $domainwww = 1 ]; then
 	#non-ssl
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site-wwwredir >> /etc/apache2/sites-available/"$sitename"_nossl.conf
-	echo "" >> /etc/apache2/sites-available/"$sitename"_nossl.conf
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site-wwwredir >> "$apacheConfDir"/sites-available/"$sitename"_nossl.conf
+	echo "" >> "$apacheConfDir"/sites-available/"$sitename"_nossl.conf
 	#ssl 
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site_ssl-wwwredir >> /etc/apache2/sites-available/"$sitename"_ssl.conf
-	echo "" >> /etc/apache2/sites-available/"$sitename"_ssl.conf
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site_ssl-wwwredir >> "$apacheConfDir"/sites-available/"$sitename"_ssl.conf
+	echo "" >> "$apacheConfDir"/sites-available/"$sitename"_ssl.conf
 fi
 
 #non-ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site-unconfigured >> /etc/apache2/sites-available/"$sitename"_nossl.conf
-sed -i -e 's/DOMAINname/'$domain'/' /etc/apache2/sites-available/"$sitename"_nossl.conf 
-ln -s /etc/apache2/sites-available/"$sitename"_nossl.conf /etc/apache2/sites-enabled/010-"$sitename".conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site-unconfigured >> "$apacheConfDir"/sites-available/"$sitename"_nossl.conf
+sed -i -e 's/DOMAINname/'$domain'/g' "$apacheConfDir"/sites-available/"$sitename"_nossl.conf 
+ln -s "$apacheConfDir"/sites-available/"$sitename"_nossl.conf "$apacheConfDir"/sites-enabled/010-"$sitename".conf
 #ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site_ssl-unconfigured >> /etc/apache2/sites-available/"$sitename"_ssl.conf
-sed -i -e 's/DOMAINname/'$domain'/' /etc/apache2/sites-available/"$sitename"_ssl.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site_ssl-unconfigured >> "$apacheConfDir"/sites-available/"$sitename"_ssl.conf
+sed -i -e 's/DOMAINname/'$domain'/g' "$apacheConfDir"/sites-available/"$sitename"_ssl.conf
 
-systemctl reload apache2
+systemctl reload $apacheService

CoreModules/apache/apt.list

@@ -1 +0,0 @@
-apache2 libapache2-mod-fcgid python-certbot-apache

CoreModules/apache/apt.pkg.list

@@ -0,0 +1 @@
+apache2 libapache2-mod-fcgid

CoreModules/apache/conf.sh

@@ -1,52 +1,69 @@
-systemctl stop apache2
+systemctl stop $apacheService > $OUTPUT 2>&1
 
 ##############
 #   Apache   #
 ##############
 
-a2dissite 000-default 
-a2dismod mpm_prefork
-a2enmod actions fcgid alias proxy_fcgi ssl headers http2 setenvif socache_shmcb
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+	a2dissite 000-default > $OUTPUT 2>&1
+	a2dismod mpm_prefork > $OUTPUT 2>&1
+	a2enmod actions fcgid alias proxy_fcgi ssl headers http2 setenvif socache_shmcb > $OUTPUT 2>&1
+	mkdir -p "$apacheConfDir"/snippets/
+elif [ "$shortdist" = "el8" ]; then
+	echo 'IncludeOptional conf-enabled/*.conf' >>/etc/httpd/conf/httpd.conf
+	echo 'IncludeOptional sites-enabled/*.conf' >>/etc/httpd/conf/httpd.conf
+	sed -i -e '/User apache/c\User www-data' -e '/Group apache/c\Group www-data' /etc/httpd/conf/httpd.conf
+	sed -i 's/^/#/g' /etc/httpd/conf.d/welcome.conf
+	#Creating directories
+    mkdir -p /etc/httpd/{sites-available,sites-enabled,conf-enabled,conf-available,snippets}
+	#getting aditional apache config for centos
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/conf-httpd-custom.conf -o "$apacheConfDir"/conf-enabled/zzz-Httpd-custom.conf
+fi
 
-mkdir -p /etc/apache2/snippets/
-wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/snippets-ssl.conf -O /etc/apache2/snippets/apa-ssl.conf
-wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/conf-custom.conf -O /etc/apache2/conf-enabled/zzz-custom.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/snippets-ssl.conf -o "$apacheConfDir"/snippets/apa-ssl.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/snippets-backendredir.conf -o "$apacheConfDir"/snippets/apa-backendredir.conf
+sed -i -e 's/HOSTname/'$hostname'/' "$apacheConfDir"/snippets/apa-backendredir.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/conf-custom.conf -o "$apacheConfDir"/conf-enabled/zzz-custom.conf
 
 #Catch all (ip and unconfigured domains)
-wget - -t7 "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site_CatchAll -O /etc/apache2/sites-available/CatchAll.conf
-ln -s /etc/apache2/sites-available/CatchAll.conf /etc/apache2/sites-enabled/999-CatchAll.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site_CatchAll -o "$apacheConfDir"/sites-available/CatchAll.conf
+ln -s "$apacheConfDir"/sites-available/CatchAll.conf "$apacheConfDir"/sites-enabled/999-CatchAll.conf
 
 
 if [ $domainwww = 1 ]; then
 	#non-ssl
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site-wwwredir >> /etc/apache2/sites-available/"$sitename"_nossl.conf
-	echo "" >> /etc/apache2/sites-available/"$sitename"_nossl.conf
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site-wwwredir >> "$apacheConfDir"/sites-available/"$sitename"_nossl.conf
+	echo "" >> "$apacheConfDir"/sites-available/"$sitename"_nossl.conf
 	#ssl 
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site_ssl-wwwredir >> /etc/apache2/sites-available/"$sitename"_ssl.conf
-	echo "" >> /etc/apache2/sites-available/"$sitename"_ssl.conf
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site_ssl-wwwredir >> "$apacheConfDir"/sites-available/"$sitename"_ssl.conf
+	echo "" >> "$apacheConfDir"/sites-available/"$sitename"_ssl.conf
 fi
 #non-ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site-unconfigured >> /etc/apache2/sites-available/"$sitename"_nossl.conf
-sed -i -e 's/DOMAINname/'$domain'/' /etc/apache2/sites-available/"$sitename"_nossl.conf 
-ln -s /etc/apache2/sites-available/"$sitename"_nossl.conf /etc/apache2/sites-enabled/010-"$sitename".conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site-unconfigured >> "$apacheConfDir"/sites-available/"$sitename"_nossl.conf
+sed -i -e 's/DOMAINname/'$domain'/g' "$apacheConfDir"/sites-available/"$sitename"_nossl.conf 
+ln -s "$apacheConfDir"/sites-available/"$sitename"_nossl.conf "$apacheConfDir"/sites-enabled/010-"$sitename".conf
 #ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site_ssl-unconfigured >> /etc/apache2/sites-available/"$sitename"_ssl.conf
-sed -i -e 's/DOMAINname/'$domain'/' /etc/apache2/sites-available/"$sitename"_ssl.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site_ssl-unconfigured >> "$apacheConfDir"/sites-available/"$sitename"_ssl.conf
+sed -i -e 's/DOMAINname/'$domain'/g' "$apacheConfDir"/sites-available/"$sitename"_ssl.conf
 
 #non-ssl-Backend
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site-unconfigured >> /etc/apache2/sites-available/Backend_nossl.conf
-sed -i -e 's/DOMAINname/'$hostname'/' /etc/apache2/sites-available/Backend_nossl.conf 
-ln -s /etc/apache2/sites-available/Backend_nossl.conf /etc/apache2/sites-enabled/010-Backend.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site-unconfigured >> "$apacheConfDir"/sites-available/Backend_nossl.conf
+sed -i -e 's/DOMAINname/'$hostname'/g' "$apacheConfDir"/sites-available/Backend_nossl.conf 
+ln -s "$apacheConfDir"/sites-available/Backend_nossl.conf "$apacheConfDir"/sites-enabled/010-Backend.conf
 #ssl-Backend
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site_ssl-unconfigured >> /etc/apache2/sites-available/Backend_ssl.conf
-sed -i -e 's/DOMAINname/'$hostname'/' /etc/apache2/sites-available/Backend_ssl.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/site_ssl-unconfigured >> "$apacheConfDir"/sites-available/Backend_ssl.conf
+sed -i -e 's/DOMAINname/'$hostname'/g' "$apacheConfDir"/sites-available/Backend_ssl.conf
 
 
 mkdir -p /opt/toggle
-wget -q -t7 "$repo"/raw/branch/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh -O  /opt/toggle/toggle-PhpMyAdmin.sh
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh -o /opt/toggle/toggle-PhpMyAdmin.sh
+sed -i -e 's/APASRV/'$apacheService'/' -e 's#APADIR#'$apacheConfDir'#'  /opt/toggle/toggle-PhpMyAdmin.sh
+
+ 
 
 
 # custom Welcome page
 echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /var/www/html/index.html
 
-systemctl start apache2
+systemctl start $apacheService > $OUTPUT 2>&1
+systemctl enable $apacheService > $OUTPUT 2>&1

CoreModules/apache/config/apache2/conf-httpd-custom.conf

@@ -0,0 +1 @@
+Define APACHE_LOG_DIR /var/log/httpd

CoreModules/apache/config/apache2/site_ssl-unconfigured

@@ -6,9 +6,8 @@
 <VirtualHost *:443>
     ServerName DOMAINname
     SSLEngine on
-    SSLCertificateFile      /etc/letsencrypt/live/DOMAINname/cert.pem
-    SSLCertificateKeyFile   /etc/letsencrypt/live/DOMAINname/privkey.pem
-    SSLCertificateChainFile /etc/letsencrypt/live/DOMAINname/chain.pem
+    SSLCertificateFile       /etc/acmesh/certs/DOMAINname_ecc/fullchain.cer
+    SSLCertificateKeyFile   /etc/acmesh/certs/DOMAINname_ecc/DOMAINname.key
     Include snippets/apa-ssl.conf
 
 #ConfHere

CoreModules/apache/config/apache2/site_ssl-wwwredir

@@ -6,9 +6,8 @@
 <VirtualHost *:443>
     ServerName www.DOMAINname
     SSLEngine on
-    SSLCertificateFile      /etc/letsencrypt/live/DOMAINname/cert.pem
-    SSLCertificateKeyFile   /etc/letsencrypt/live/DOMAINname/privkey.pem
-    SSLCertificateChainFile /etc/letsencrypt/live/DOMAINname/chain.pem
+    SSLCertificateFile       /etc/acmesh/certs/DOMAINname_ecc/fullchain.cer
+    SSLCertificateKeyFile   /etc/acmesh/certs/DOMAINname_ecc/DOMAINname.key
     Include snippets/apa-ssl.conf
     Redirect permanent / https://DOMAINname/
 </VirtualHost>

CoreModules/apache/config/apache2/snippets-backendredir.conf

@@ -0,0 +1 @@
+Redirect 301 /database http://HOSTname/backend/database

CoreModules/apache/config/apache2/snippets-ssl.conf

@@ -3,5 +3,6 @@ Header always set Strict-Transport-Security "max-age=63072000"
 SSLProtocol             all -SSLv3 -TLSv1 -TLSv1.1
 SSLCipherSuite          ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
 SSLHonorCipherOrder     on
+SSLOpenSSLConfCmd       Curves secp384r1
 SSLSessionTickets       off
-SSLUseStapling On
+SSLUseStapling On

CoreModules/apache/dnf.pkg.list

@@ -0,0 +1 @@
+httpd mod_fcgid mod_ssl

CoreModules/apache/phpupdate-handeler.sh

@@ -0,0 +1,27 @@
+if [ ! -f "/etc/ICTM/apachevar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GenerateApacheList.sh) ; fi
+source /etc/ICTM/apachevar.list
+
+for f in $apacheConfDir/sites-available/*; do
+    if [ $IMODE = n ] && [ $PhpPurge = 0 ]; then
+        if (whiptail --title "Update apache config ?" --yesno "Update php version in apache site: ${f##*/}  ?" 8 78); then
+            sed -i  "s/$phpver/$newphpver/" $f
+        fi
+    fi
+    if [ $IMODE = l ] && [ $PhpPurge = 0 ]; then
+            while true; do
+                read -p "Update php version in apache site: ${f##*/} ? -> yes/no?" yn
+                case $yn in
+                [Yy]* ) sed -i  "s/$phpver/$newphpver/" $f
+                break;;
+                [Nn]* ) echo ""
+                break;;
+                * ) echo "Choose yes of no.";;
+            esac
+        done    
+    fi
+    if [ $PhpPurge = 1 ]; then
+        sed -i  "s/$phpver/$newphpver/" $f
+    fi
+done
+ 
+systemctl reload $apacheService

CoreModules/apache/preconf.sh

@@ -1 +1,17 @@
-$PKGA ppa:ondrej/apache2 -y -n > $OUTPUT 2>&1
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+# Debian/Ubunbtu apache variables
+    apacheConfDir=/etc/apache2
+    apacheService=apache2
+
+elif [ "$shortdist" = "el8" ]; then
+# Centos Php variable
+    apacheConfDir=/etc/httpd
+    apacheService=httpd
+fi
+
+#Storing vars to config
+for storeme in apacheService apacheConfDir; do
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/apachevar.list
+done
+
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=apache osrel=$shortdist bash > $OUTPUT 2>&1 > $OUTPUT 2>&1

CoreModules/apache/ssl-handler.sh

@@ -1,9 +1,9 @@
-rm /etc/apache2/sites-enabled/010-"$sitename".conf
-ln -s /etc/apache2/sites-available/"$sitename"_ssl.conf /etc/apache2/sites-enabled/010-"$sitename".conf
+rm "$apacheConfDir"/sites-enabled/010-"$sitename".conf
+ln -s "$apacheConfDir"/sites-available/"$sitename"_"$site_ext".conf "$apacheConfDir"/sites-enabled/010-"$sitename".conf
 
 if [ -n "$sslfr" ]; then
-rm /etc/apache2/sites-enabled/010-Backend.conf
-ln -s /etc/apache2/sites-available/Backend_ssl.conf /etc/apache2/sites-enabled/010-Backend.conf
+rm "$apacheConfDir"/sites-enabled/010-Backend.conf
+ln -s "$apacheConfDir"/sites-available/Backend_"$siteBackend_ext".conf "$apacheConfDir"/sites-enabled/010-Backend.conf
 fi
 
-systemctl reload apache2
+systemctl reload $apacheService

CoreModules/generic/apt.list

@@ -1 +0,0 @@
-mailutils htop ufw nload fail2ban

CoreModules/generic/apt.pkg.list

@@ -0,0 +1 @@
+cron

CoreModules/generic/conf.sh

@@ -1,22 +1,26 @@
-##-------------##
-#    Postfix    #
-##-------------##
-
-sed -i 's/#inet_interfaces = all/inet_interfaces = loopback-only/g' /etc/postfix/main.cf
-sed -i 's/mydestination/#mydestination/g' /etc/postfix/main.cf
-sed -i 's/relayhost =/mydestination = '$hostname', localhost.'$hostname', '$hostname'/g' /etc/postfix/main.cf
-echo "bounce_notice_recipient = info@$domain" >> /etc/postfix/main.cf
-cat <<EOF > /etc/aliases
-# See man 5 aliases for format
-postmaster:    root
-root:          $email
-EOF
-newaliases
+##----------##
+#   Centos   #
+##----------##
+if [ "$shortdist" = "el8" ]; then
+    #SeLinux
+    semanage port -a -t ssh_port_t -p tcp 4242
+    systemctl enable ufw > $OUTPUT 2>&1
+    #Motd
+    mkdir /etc/update-motd.d
+    echo 'if stat --printf="" /etc/update-motd.d/51* 2>/dev/null; then for f in /etc/update-motd.d/51*; do bash $f; done; fi' >> /etc/profile
+fi
 
 ##-------##
 #   UFW   #
 ##-------##
 
+if [ "$shortdist" = "el8" ]; then
+    sed -i -e '/tuple/d' -e '/dapp/d' /usr/share/ufw/iptables/user.rules
+    sed -i -e '/tuple/d' -e '/dapp/d' /usr/share/ufw/iptables/user6.rules
+    echo "y" | ufw reset > $OUTPUT 2>&1
+    systemctl enable ufw > $OUTPUT 2>&1
+fi
+
 sed -i '/IPV6=/c\IPV6=yes' /etc/default/ufw
 ufw default deny incoming > $OUTPUT 2>&1
 ufw default allow outgoing > $OUTPUT 2>&1
@@ -30,18 +34,30 @@ echo "y" | ufw enable > $OUTPUT 2>&1
 ##------------##
 
 #General config
-wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/jail.local -O /etc/fail2ban/jail.local
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/config/fail2ban/jail.local -o /etc/fail2ban/jail.local
 
 #Custom Fiters
-wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Filters/nextcloud.filter -O /etc/fail2ban/filter.d/nextcloud.local
-wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Filters/phpmyadmin-authlog.filter -O /etc/fail2ban/filter.d/phpmyadmin-authlog.local
-wget -q -t7 https://plugins.svn.wordpress.org/wp-fail2ban/trunk/filters.d/wordpress-hard.conf -O /etc/fail2ban/filter.d/wordpress-hard.local
-wget -q -t7 https://plugins.svn.wordpress.org/wp-fail2ban/trunk/filters.d/wordpress-soft.conf -O /etc/fail2ban/filter.d/wordpress-soft.local
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/config/fail2ban/Filters/nextcloud.filter -o /etc/fail2ban/filter.d/nextcloud.local
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/config/fail2ban/Filters/phpmyadmin-authlog.filter -o /etc/fail2ban/filter.d/phpmyadmin-authlog.local
+curl --retry 7 --retry-delay 5 -s https://plugins.svn.wordpress.org/wp-fail2ban/trunk/filters.d/wordpress-hard.conf -o /etc/fail2ban/filter.d/wordpress-hard.local
+curl --retry 7 --retry-delay 5 -s https://plugins.svn.wordpress.org/wp-fail2ban/trunk/filters.d/wordpress-soft.conf -o /etc/fail2ban/filter.d/wordpress-soft.local
+
+if [ "$shortdist" = "el8" ]; then
+    curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/config/fail2ban/action.d/ufw.conf -o /etc/fail2ban/action.d/ufw.conf
+    curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/config/selinux/policies/fail2ban-allowhttpd.te -o /tmp/fail2ban-allowhttpd.te
+    checkmodule -M -m -o /tmp/fail2ban-allowhttpd.mod /tmp/fail2ban-allowhttpd.te
+    semodule_package -o /tmp/fail2ban-allowhttpd.pp -m /tmp/fail2ban-allowhttpd.mod
+    semodule -i /tmp/fail2ban-allowhttpd.pp
+fi
+
+#Start fail2ban service
+systemctl start fail2ban
+systemctl enable fail2ban
 
 #General jails
 rm /etc/fail2ban/jail.d/*
-wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Jails/sshd.jail -O /etc/fail2ban/jail.d/sshd.local
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/config/fail2ban/Jails/sshd.jail -o /etc/fail2ban/jail.d/sshd.local
 if [ -z $disbackendcms ]; then
- wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Jails/phpmyadmin.jail -O /etc/fail2ban/jail.d/phpmyadmin.local
+ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/config/fail2ban/Jails/phpmyadmin.jail -o /etc/fail2ban/jail.d/phpmyadmin.local
 fi
 

CoreModules/generic/dnf.pkg.list

@@ -0,0 +1 @@
+cronie policycoreutils-python-utils

CoreModules/generic/generic.pkg.list

@@ -0,0 +1 @@
+nano htop ufw nload fail2ban sudo bash-completion

CoreModules/generic/preconf.sh

@@ -1,25 +1,77 @@
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+########################
+#    Debian/Ubunbtu    #
+########################
+    ##--------------##
+    #  Repositories  #
+    ##--------------##
+
+    curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=universe osrel=$shortdist bash > $OUTPUT 2>&1
+    ##------------##
+    #    System    #
+    ##------------##
+    
+    sed -i -e '/XKBLAYOUT=/c\XKBLAYOUT=us' -e '/XKBVARIANT=/c\XKBVARIANT="intl"' /etc/default/keyboard > $OUTPUT 2>&1
+
+
+    ##-------------##
+    #    Updates    #
+    ##-------------##
+
+    debconf-set-selections <<< 'libssl1.1:amd64 libraries/restart-without-asking boolean true'
+    $PKGUC
+    $PKGUP
+
+
+    ##-------------##
+    #    Postfix    #
+    ##-------------##
+
+    #Checking if postfix exists on this system and if so it wil be removed to prevent config conflicts
+    if dpkg-query -Wf'${db:Status-abbrev}' postfix 2>/dev/null | grep -q '^i'; then apt purge -y postfix > $OUTPUT 2>&1; fi
+
+
+elif [ "$shortdist" = "el8" ]; then
+################
+#    Centos    #
+################
+    ##--------------##
+    #  Repositories  #
+    ##--------------##
+
+    curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=epel osrel=$shortdist bash > $OUTPUT 2>&1
+
+    ##------------##
+    #    System    #
+    ##------------##
+
+    localectl set-keymap us > $OUTPUT 2>&1
+    useradd -r -U -s /usr/sbin/nologin -d /var/www  www-data > $OUTPUT 2>&1
+    systemctl disable firewalld --now > $OUTPUT 2>&1
+
+    ##-------------##
+    #    Postfix    #
+    ##-------------##
+
+    if dnf list installed postfix >/dev/null 2>&1; then dnf remove postfix -y; fi
+    
+fi
+
+
+#################
+#    General    #
+#################
 ##-----------------------##
 #  Prerequisite packages  #
 ##-----------------------##
 
-$PKGI software-properties-common gnupg > $OUTPUT 2>&1
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
+
 
 ##--------------##
 #  Repositories  #
 ##--------------##
-
-$PKGA universe -y > $OUTPUT 2>&1
-$PKGA ppa:ondrej/php -y -n > $OUTPUT 2>&1
-$PKGA ppa:certbot/certbot -y -n > $OUTPUT 2>&1
-
-
-##-------------##
-#    Updates    #
-##-------------##
-
-debconf-set-selections <<< 'libssl1.1:amd64 libraries/restart-without-asking boolean true'
-$PKGM update
-$PKGM upgrade -y
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=php osrel=$shortdist bash > $OUTPUT 2>&1
 
 
 ##------------##
@@ -27,9 +79,9 @@ $PKGM upgrade -y
 ##------------##
 
 hostnamectl set-hostname $hostname
-sed -i 's/;preserve_hostname: false/preserve_hostname: true/g' /etc/cloud/cloud.cfg
-timedatectl set-timezone Europe/Amsterdam
-sed -i -e '/Port 22/c\Port 4242' -e 's/PermitRootLogin yes/PermitRootLogin prohibit-password/g' /etc/ssh/sshd_config
+sed -i 's/;preserve_hostname: false/preserve_hostname: true/g' /etc/cloud/cloud.cfg > $OUTPUT 2>&1
+timedatectl set-timezone Europe/Amsterdam > $OUTPUT 2>&1
+sed -i -e '/Port 22/c\Port 4242' -e 's/PermitRootLogin yes/PermitRootLogin prohibit-password/g' /etc/ssh/sshd_config > $OUTPUT 2>&1
 
 
 ##----------##
@@ -47,14 +99,3 @@ else
 fi
 echo "vm.swappiness=10" >> /etc/sysctl.conf
 echo "vm.vfs_cache_pressure=50" >> /etc/sysctl.conf
-
-
-##-------------##
-#    Postfix    #
-##-------------##
-
-#Checking if postfix exists on this system and if so it wil be removed to prevent config conflicts
-if dpkg-query -Wf'${db:Status-abbrev}' postfix 2>/dev/null | grep -q '^i'; then apt purge -y postfix > $OUTPUT 2>&1; fi
-
-debconf-set-selections <<< "postfix postfix/mailname string $domain"
-debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Internet Site'"

CoreModules/nginx/appendCMS-conf.sh

@@ -4,19 +4,19 @@
 
 if [ $domainwww = 1 ]; then
 	#non-ssl
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site-wwwredir >> /etc/nginx/sites-available/"$sitename"_nossl
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site-wwwredir >> /etc/nginx/sites-available/"$sitename"_nossl
 	echo "" >> /etc/nginx/sites-available/"$sitename"_nossl
 	#ssl 
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site_ssl-wwwredir >> /etc/nginx/sites-available/"$sitename"_ssl
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site_ssl-wwwredir >> /etc/nginx/sites-available/"$sitename"_ssl
 	echo "" >> /etc/nginx/sites-available/"$sitename"_ssl 
 fi
 
 #non-ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/"$sitename"_nossl 
-sed -i -e 's/DOMAINname/'$domain'/' /etc/nginx/sites-available/"$sitename"_nossl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/"$sitename"_nossl 
+sed -i -e 's/DOMAINname/'$domain'/g' /etc/nginx/sites-available/"$sitename"_nossl 
 ln -s /etc/nginx/sites-available/"$sitename"_nossl /etc/nginx/sites-enabled/"$sitename"
 #ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/"$sitename"_ssl 
-sed -i -e 's/DOMAINname/'$domain'/' /etc/nginx/sites-available/"$sitename"_ssl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/"$sitename"_ssl 
+sed -i -e 's/DOMAINname/'$domain'/g' /etc/nginx/sites-available/"$sitename"_ssl 
 
 systemctl reload nginx

CoreModules/nginx/apt.list

@@ -1 +0,0 @@
-nginx apache2-utils python-certbot-nginx

CoreModules/nginx/apt.pkg.list

@@ -0,0 +1 @@
+apache2-utils

CoreModules/nginx/conf.sh

@@ -5,41 +5,43 @@ systemctl stop nginx
 #############
 
 mkdir -p /var/www/html /etc/nginx/sites-available /etc/nginx/sites-enabled /etc/nginx/snippets /etc/nginx/modules-available /etc/nginx/modules-enabled /etc/nginx/snippets/
-wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/fastcgi.conf -O /etc/nginx/fastcgi.conf
-wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/fastcgi-php.conf -O /etc/nginx/snippets/fastcgi-php.conf
-wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/snippets-ssl.conf -O /etc/nginx/snippets/ngx-ssl.conf
-wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/nginx-default.conf -O /etc/nginx/nginx.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/fastcgi.conf -o /etc/nginx/fastcgi.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/fastcgi-php.conf -o /etc/nginx/snippets/fastcgi-php.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/snippets-ssl.conf -o /etc/nginx/snippets/ngx-ssl.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/snippets-backendredir.conf -o /etc/nginx/snippets/ngx-backendredir.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/nginx-default.conf -o /etc/nginx/nginx.conf
 
 if [ $domainwww = 1 ]; then
 	#non-ssl
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site-wwwredir >> /etc/nginx/sites-available/"$sitename"_nossl
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site-wwwredir >> /etc/nginx/sites-available/"$sitename"_nossl
 	echo "" >> /etc/nginx/sites-available/"$sitename"_nossl
 	#ssl 
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site_ssl-wwwredir >> /etc/nginx/sites-available/"$sitename"_ssl
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site_ssl-wwwredir >> /etc/nginx/sites-available/"$sitename"_ssl
 	echo "" >> /etc/nginx/sites-available/"$sitename"_ssl 
 fi
 #non-ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/"$sitename"_nossl 
-sed -i -e 's/DOMAINname/'$domain'/' /etc/nginx/sites-available/"$sitename"_nossl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/"$sitename"_nossl 
+sed -i -e 's/DOMAINname/'$domain'/g' /etc/nginx/sites-available/"$sitename"_nossl 
 ln -s /etc/nginx/sites-available/"$sitename"_nossl /etc/nginx/sites-enabled/"$sitename"
 #ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/"$sitename"_ssl 
-sed -i -e 's/DOMAINname/'$domain'/' /etc/nginx/sites-available/"$sitename"_ssl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/"$sitename"_ssl 
+sed -i -e 's/DOMAINname/'$domain'/g' /etc/nginx/sites-available/"$sitename"_ssl 
 
 #Backend
 ##non-ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/Backend_nossl 
-sed -i -e 's/DOMAINname/'$hostname'/' /etc/nginx/sites-available/Backend_nossl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/Backend_nossl 
+sed -i -e 's/DOMAINname/'$hostname'/g' /etc/nginx/sites-available/Backend_nossl 
 ln -s /etc/nginx/sites-available/Backend_nossl /etc/nginx/sites-enabled/Backend
 ##ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/Backend_ssl 
-sed -i -e 's/DOMAINname/'$hostname'/' /etc/nginx/sites-available/Backend_ssl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/Backend_ssl 
+sed -i -e 's/DOMAINname/'$hostname'/g' /etc/nginx/sites-available/Backend_ssl 
 
 mkdir -p /opt/toggle
-wget -q -t7 "$repo"/raw/branch/"$branch"/Scripts/toggles/toggle-Netdata_NGINX.sh -O  /opt/toggle/toggle-Netdata.sh
-wget -q -t7 "$repo"/raw/branch/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_NGINX.sh -O  /opt/toggle/toggle-PhpMyAdmin.sh
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-Netdata_NGINX.sh -o  /opt/toggle/toggle-Netdata.sh
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_NGINX.sh -o  /opt/toggle/toggle-PhpMyAdmin.sh
 
 # custom Welcome page
 echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /usr/share/nginx/html/index.html
 
-systemctl start nginx
+systemctl start nginx > $OUTPUT 2>&1
+systemctl enable nginx > $OUTPUT 2>&1

CoreModules/nginx/config/nginx/site_ssl-unconfigured

@@ -13,8 +13,9 @@ server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2; 
     server_name   DOMAINname;
-    ssl_certificate /etc/letsencrypt/live/DOMAINname/fullchain.pem; 
-    ssl_certificate_key /etc/letsencrypt/live/DOMAINname/privkey.pem; 
+    ssl_certificate /etc/acmesh/certs/DOMAINname_ecc/fullchain.cer;
+    ssl_certificate_key /etc/acmesh/certs/DOMAINname_ecc/DOMAINname.key;
+    ssl_trusted_certificate /etc/acmesh/certs/DOMAINname_ecc/fullchain.cer;
     include snippets/ngx-ssl.conf; 
     
     

CoreModules/nginx/config/nginx/site_ssl-wwwredir

@@ -11,8 +11,9 @@ server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2; 
     server_name   www.DOMAINname;
-    ssl_certificate /etc/letsencrypt/live/DOMAINname/fullchain.pem; 
-    ssl_certificate_key /etc/letsencrypt/live/DOMAINname/privkey.pem; 
+    ssl_certificate /etc/acmesh/certs/DOMAINname_ecc/fullchain.cer;
+    ssl_certificate_key /etc/acmesh/certs/DOMAINname_ecc/DOMAINname.key;
+    ssl_trusted_certificate /etc/acmesh/certs/DOMAINname_ecc/fullchain.cer; 
     include snippets/ngx-ssl.conf; 
     return       301 https://DOMAINname$request_uri;
 }

CoreModules/nginx/config/nginx/snippets-backendredir.conf

@@ -0,0 +1,3 @@
+    location /database {
+        return 301 http://$hostname/backend/database;
+    }

CoreModules/nginx/config/nginx/snippets-ssl.conf

@@ -1,5 +1,9 @@
+resolver 8.8.8.8;
+ssl_ecdh_curve secp384r1;
 ssl_session_cache shared:le_nginx_SSL:1m;
 ssl_session_timeout 1440m;
+ssl_stapling on;
+ssl_stapling_verify on;
 ssl_prefer_server_ciphers on;
 ssl_protocols TLSv1.2 TLSv1.3;
 ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
@@ -7,4 +11,4 @@ add_header X-Frame-Options sameorigin;
 add_header X-Content-Type-Options nosniff;
 add_header X-Xss-Protection "1; mode=block";
 add_header Strict-Transport-Security "max-age=31536000" always;
-ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+ssl_dhparam /etc/acmesh/certs/ssl-dhparams.pem;

CoreModules/nginx/dnf.pkg.list

@@ -0,0 +1 @@
+httpd-tools

CoreModules/nginx/generic.pkg.list

@@ -0,0 +1 @@
+nginx

CoreModules/nginx/preconf.sh

@@ -1,2 +1 @@
-echo "deb http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" > /etc/apt/sources.list.d/nginx.list
-curl -fsSL https://nginx.org/keys/nginx_signing.key | sudo apt-key add -
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=nginx osrel=$shortdist bash > $OUTPUT 2>&1

CoreModules/nginx/ssl-handler.sh

@@ -1,9 +1,9 @@
 rm /etc/nginx/sites-enabled/"$sitename"
-ln -s /etc/nginx/sites-available/"$sitename"_ssl /etc/nginx/sites-enabled/"$sitename"
+ln -s /etc/nginx/sites-available/"$sitename"_"$site_ext" /etc/nginx/sites-enabled/"$sitename"
 
 if [ -n "$sslfr" ]; then
-rm /etc/nginx/sites-enabled/Backend
-ln -s /etc/nginx/sites-available/Backend_ssl /etc/nginx/sites-enabled/Backend
+    rm /etc/nginx/sites-enabled/Backend
+    ln -s /etc/nginx/sites-available/Backend_"$siteBackend_ext" /etc/nginx/sites-enabled/Backend
 fi
 
 systemctl reload nginx

CoreModules/nginx_nonphp/appendCMS-conf.sh

@@ -4,19 +4,19 @@
 
 if [ $domainwww = 1 ]; then
 	#non-ssl
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site-wwwredir >> /etc/nginx/sites-available/"$sitename"_nossl
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site-wwwredir >> /etc/nginx/sites-available/"$sitename"_nossl
 	echo "" >> /etc/nginx/sites-available/"$sitename"_nossl
 	#ssl 
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site_ssl-wwwredir >> /etc/nginx/sites-available/"$sitename"_ssl
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site_ssl-wwwredir >> /etc/nginx/sites-available/"$sitename"_ssl
 	echo "" >> /etc/nginx/sites-available/"$sitename"_ssl 
 fi
 
 #non-ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/"$sitename"_nossl 
-sed -i -e 's/DOMAINname/'$domain'/' /etc/nginx/sites-available/"$sitename"_nossl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/"$sitename"_nossl 
+sed -i -e 's/DOMAINname/'$domain'/g' /etc/nginx/sites-available/"$sitename"_nossl 
 ln -s /etc/nginx/sites-available/"$sitename"_nossl /etc/nginx/sites-enabled/"$sitename"
 #ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/"$sitename"_ssl 
-sed -i -e 's/DOMAINname/'$domain'/' /etc/nginx/sites-available/"$sitename"_ssl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/"$sitename"_ssl 
+sed -i -e 's/DOMAINname/'$domain'/g' /etc/nginx/sites-available/"$sitename"_ssl 
 
 systemctl reload nginx

CoreModules/nginx_nonphp/apt.list

@@ -1 +0,0 @@
-nginx apache2-utils python-certbot-nginx

CoreModules/nginx_nonphp/apt.pkg.list

@@ -0,0 +1 @@
+apache2-utils

CoreModules/nginx_nonphp/conf.sh

@@ -5,27 +5,28 @@ systemctl stop nginx
 #############
 
 mkdir -p /var/www/html /etc/nginx/sites-available /etc/nginx/sites-enabled /etc/nginx/snippets /etc/nginx/modules-available /etc/nginx/modules-enabled /etc/nginx/snippets/
-wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/fastcgi.conf -O /etc/nginx/fastcgi.conf
-wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/snippets-ssl.conf -O /etc/nginx/snippets/ngx-ssl.conf
-wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/nginx-default.conf -O /etc/nginx/nginx.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/fastcgi.conf -o /etc/nginx/fastcgi.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/snippets-ssl.conf -o /etc/nginx/snippets/ngx-ssl.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/nginx-default.conf -o /etc/nginx/nginx.conf
 
 if [ $domainwww = 1 ]; then
 	#non-ssl
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site-wwwredir >> /etc/nginx/sites-available/"$sitename"_nossl
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site-wwwredir >> /etc/nginx/sites-available/"$sitename"_nossl
 	echo "" >> /etc/nginx/sites-available/"$sitename"_nossl
 	#ssl 
-	wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site_ssl-wwwredir >> /etc/nginx/sites-available/"$sitename"_ssl
+	curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site_ssl-wwwredir >> /etc/nginx/sites-available/"$sitename"_ssl
 	echo "" >> /etc/nginx/sites-available/"$sitename"_ssl 
 fi
 #non-ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/"$sitename"_nossl 
-sed -i -e 's/DOMAINname/'$domain'/' /etc/nginx/sites-available/"$sitename"_nossl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site-unconfigured >> /etc/nginx/sites-available/"$sitename"_nossl 
+sed -i -e 's/DOMAINname/'$domain'/g' /etc/nginx/sites-available/"$sitename"_nossl 
 ln -s /etc/nginx/sites-available/"$sitename"_nossl /etc/nginx/sites-enabled/"$sitename"
 #ssl
-wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/"$sitename"_ssl 
-sed -i -e 's/DOMAINname/'$domain'/' /etc/nginx/sites-available/"$sitename"_ssl 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/nginx/config/nginx/site_ssl-unconfigured >> /etc/nginx/sites-available/"$sitename"_ssl 
+sed -i -e 's/DOMAINname/'$domain'/g' /etc/nginx/sites-available/"$sitename"_ssl 
 
 # custom Welcome page
 echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /usr/share/nginx/html/index.html
 
-systemctl start nginx
+systemctl start nginx > $OUTPUT 2>&1
+systemctl enable nginx > $OUTPUT 2>&1

CoreModules/nginx_nonphp/dnf.pkg.list

@@ -0,0 +1 @@
+httpd-tools

CoreModules/nginx_nonphp/generic.pkg.list

@@ -0,0 +1 @@
+nginx

CoreModules/nginx_nonphp/preconf.sh

@@ -1,5 +1,4 @@
-echo "deb http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" > /etc/apt/sources.list.d/nginx.list
-curl -fsSL https://nginx.org/keys/nginx_signing.key | sudo apt-key add -
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=nginx osrel=$shortdist bash > $OUTPUT 2>&1
 
 #Disable PhpMyadmin and Backend cms
 disbackendcms=1

CoreModules/nginx_nonphp/ssl-handler.sh

@@ -1,4 +1,4 @@
 rm /etc/nginx/sites-enabled/"$sitename"
-ln -s /etc/nginx/sites-available/"$sitename"_ssl /etc/nginx/sites-enabled/"$sitename"
+ln -s /etc/nginx/sites-available/"$sitename"_"$site_ext" /etc/nginx/sites-enabled/"$sitename"
 
 systemctl reload nginx

Docs/docs/Dev-Adding-CMS.md

@@ -3,10 +3,14 @@
 * CMS/`<NewCmsName>`/
     * conf.sh
     * preconf.sh
-    * apt.list
+    * generic.pkg.list
+	* apt.pkg.list
+	* dnf.pkg.list    
     * `<Webserver>`-conf.sh
     * `<Webserver>`-preconf.sh
-    * `<Webserver>`-apt.list
+    * `<Webserver>`-generic.pkg.list
+    * `<Webserver>`-apt.pkg.list
+    * `<Webserver>`-dnf.pkg.list
     * `<Webserver>`-unconfigured
 
 # File Explanation
@@ -14,10 +18,14 @@
 | -------- | ------------ |
 | preconf.sh  | Pre config/apt install commands runs for all web servers |
 | conf.sh  | Configuration runs for all webservers |
-| apt.list  | packagelist for all webservers |
+| generic.pkg.list | packagelist for this webserver and php for all distro's | 
+| apt.pkg.list | packagelist for this webserver and php for distro's that use apt |   
+| dnf.pkg.list | packagelist for this webserver and php for distro's that use dnf/yum |   
 | `<Webserver>`-preconf.sh  | Pre config/apt install commands runs for specified webserver |
 | `<Webserver>`-conf.sh  | Configuration runs for specified webserver |
-| `<Webserver>`-apt.list | packagelist for specified webserver |
+| `<Webserver>`-generic.pkg.list | packagelist for specified webserver for all distro's|
+| `<Webserver>`-apt.pkg.list | packagelist for specified webserver for distro's that use apt|
+| `<Webserver>`-dnf.pkg.list | packagelist for specified webserver for distro's that use dnf/yum|
 | `<Webserver>`-unconfigured | webserver(vhost) config | 
 
 
@@ -26,7 +34,7 @@
 ## nginx-conf.sh
 ```
 #Getting Nginx SiteConfig
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/<CMSName>/Nginx-unconfigured -O /tmp/nginx-siteconf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/<CMSName>/Nginx-unconfigured -o /tmp/nginx-siteconf
 
 #Configuring Nginx SiteConfig
 sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' /tmp/nginx-siteconf
@@ -43,7 +51,7 @@ systemctl reload nginx
 
 ```
 #Getting Nginx SiteConfig
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/<CMSName>/Nginx-unconfigured -O /tmp/nginx-siteconf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/<CMSName>/Nginx-unconfigured -o /tmp/nginx-siteconf
 
 #Configuring Nginx SiteConfig
 sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' /tmp/nginx-siteconf

Docs/docs/Dev-Adding-Modules.md

@@ -5,10 +5,14 @@ In both cases the file structure is expected as shown below
 # List of possible Files and expected Structure
 * conf.sh
 * preconf.sh
-* apt.list
+* generic.pkg.list
+* apt.pkg.list
+* dnf.pkg.list
 * `<webserver>`-conf.sh
 * `<webserver>`-preconf.sh
-* `<webserver>`-apt.list
+* `<Webserver>`-generic.pkg.list
+* `<Webserver>`-apt.pkg.list
+* `<Webserver>`-dnf.pkg.list
 * config/*
 
 ## The internal module location
@@ -19,10 +23,14 @@ SubModules/`<ModuleName>`
 | -------- | ------------ |
 | preconf.sh | Pre config/apt install commands runs for all web servers | 
 | conf.sh| Configuration runs for all webservers | 
-| apt.list | packagelist for all webservers | 
+| generic.pkg.list | packagelist for this webserver and php for all distro's | 
+| apt.pkg.list | packagelist for this webserver and php for distro's that use apt |   
+| dnf.pkg.list | packagelist for this webserver and php for distro's that use dnf/yum |   
 | `<Webserver>`-preconf.sh | Pre config/apt install commands runs for specified webserver |
 | `<Webserver>`-conf.sh | Configuration runs for specified webserver | 
-| `<Webserver>`-apt.list | packagelist for specified webserver | 
+| `<Webserver>`-generic.pkg.list | packagelist for specified webserver for all distro's|
+| `<Webserver>`-apt.pkg.list | packagelist for specified webserver for distro's that use apt|
+| `<Webserver>`-dnf.pkg.list | packagelist for specified webserver for distro's that use dnf/yum|
 | config/* | Directory for config files | 
 
 

Docs/docs/Dev-Adding-Webserver.md

@@ -2,7 +2,9 @@
 * CoreModules/`<webserverName>`/
     * conf.sh
 	* preconf.sh
-	* apt.list
+	* generic.pkg.list
+	* apt.pkg.list
+	* dnf.pkg.list
 	* appendCMS-conf.sh
 	* config/*
 # File Explanation
@@ -10,7 +12,9 @@
 | -------- | ------------ |
 | preconf.sh | Pre config/apt install commands (ex: repo setup) |
 | conf.sh | Configuration for webserver and php | 
-| apt.list | packagelist for this webserver and php |  
+| generic.pkg.list | packagelist for this webserver and php for all distro's | 
+| apt.pkg.list | packagelist for this webserver and php for distro's that use apt |   
+| dnf.pkg.list | packagelist for this webserver and php for distro's that use dnf/yum |   
 | appendCMS-conf.sh | Runs when a domain gets added after inital install by appendCMS.sh | 
 
 # Defining in the menu

Docs/docs/User-MainInfo.md

@@ -1,26 +1,37 @@
 # Getting/using the Normal installer (installer.sh):
 
+Using curl
 ```
-#Get installer.sh from the repo and store it at: /tmp/installer.sh    
+curl https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -o /tmp/installer.sh  
+bash /tmp/installer.sh
+```  
+
+Using wget
+```
+wget https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -O /tmp/installer.sh  
 bash /tmp/installer.sh
 ```
 # Getting/using the Legacy installer (installer.sh):
+Using curl
 ```
-#Get installer.sh from the repo and store it at: /tmp/installer.sh  
+curl https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -o /tmp/installer.sh  
 bash /tmp/installer.sh -l 2>&1 | tee ~/output.log 
-```
+```  
 
+Using wget
+```
+wget https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -O /tmp/installer.sh  
+bash /tmp/installer.sh -l 2>&1 | tee ~/output.log 
+```  
 # Adding a Domain (AppendCMS.sh):
 The script wil get most information it need from stored config, only the new domain and the mysql root password need to be entered.  
 
 ```
-#Get the AppendCMS.sh from the repo and store it at: /tmp/AppendCMS.sh
-bash /tmp/AppendCMS.sh
+bash <(curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/AppendCMS.sh)
 ```
 
 # Adding a Module/Option (AppendModule.sh):
 The script wil get most information it need from stored config
 ```
-#Get the AppendCMS.sh from the repo and store it at: /tmp/AppendModule.sh 
-bash /tmp/AppendModule.sh 
+bash <(curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/AppendModule.sh)
 ```

Docs/mkdocs.yml

@@ -1,7 +1,7 @@
 site_name: Web-V2
 theme: slate
 repo_name: 'Git Repo'
-repo_url: https://git.ictmaatwerk.com/bprieshof/UBU-Web-V2/src/branch/master
+repo_url: https://git.ictmaatwerk.com/VPS-scripts/Web-V2/src/branch/master
 nav:
     - User: 'User-MainInfo.md'
     - Development:

ModulesMenu.list

@@ -15,12 +15,14 @@ nginxCMSL+=("Wordpress:" "WordPress is a content management system based on PHP.
 nginxCMSL+=("Nextcloud:" "Nextcloud is a suite of client-server software for creating and using file hosting services." OFF)
 #Options
 nginxOptions=("Redis:" "Redis caching" OFF)
+nginxOptions+=("Postfix:" "Mail MTA" OFF)
 
 ##Nginx
 #CMSList
 nginx_nonphpCMSL=("None:" "A plain webserver will be setup." OFF)
 #Options
 nginx_nonphpOptions=("Redis:" "Redis caching" OFF)
+nginx_nonphpOptions+=("Postfix:" "Mail MTA" OFF)
 
 ##Apache
 #CMSList
@@ -29,6 +31,7 @@ apacheCMSL+=("Wordpress:" "WordPress is a content management system based on PHP
 apacheCMSL+=("Nextcloud:" "Nextcloud is a suite of client-server software for creating and using file hosting services." OFF)
 #Options
 apacheOptions=("Redis:" "Redis caching" OFF)
+apacheOptions+=("Postfix:" "Mail MTA" OFF)
 
 fi
 if [ $IMODE = l ]; then
@@ -39,18 +42,18 @@ webservers=("Nginx" "Nginx_nonphp"  "Apache" "Quit")
 #CMSList
 nginxCMSL=("None" "Wordpress" "Nextcloud")
 #Options
-nginxOptions=("Redis:")
+nginxOptions=("Redis:" "Postfix:")
 
 ##Nginx-nonphp
 #CMSList
 nginx_nonphpCMSL=("None")
 #Options
-nginx_nonphpOptions=("Redis:")
+nginx_nonphpOptions=("Redis:" "Postfix:")
 
 ##Apache
 #CMSList
 apacheCMSL=("None" "Wordpress" "Nextcloud")
 #Options
-apacheOptions=("Redis:")
+apacheOptions=("Redis:" "Postfix:")
 
 fi

PhpUpdater.sh

@@ -1,11 +1,18 @@
 #sysCheck
 if [ ! -f "/etc/ICTM/selopts.list" ] || [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
-
-PKGI="${PKGM} install -y --no-install-recommends"
+rm /tmp/pkg.list
 #Getting variables
 source /etc/ICTM/mainvar.list
-PPAversion=`apt list php | egrep -o "([0-9]{1,}.)+[0-9]{1,}" | cut -c 3-` && PPAversion=`echo $PPAversion | awk '{print $1; }'  | cut -f1 -d"+"`
-
+if [ -z $shortdist ] ; then source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/MicroOSDetect.sh) ; fi
+if [ ! -f "/etc/ICTM/phpvar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GeneratePhplist.sh) ; fi
+source /etc/ICTM/phpvar.list
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+    apt update
+    RepoVersion=`apt list |grep php | grep deb.sury.org| cut -f1 -d"-"| tail -1 |sed 's/php//'`
+elif [ "$shortdist" = "el8" ]; then
+    dnf check-update --refresh
+    RepoVersion=`dnf list php* | awk '{print $1; }' | cut -f1 -d"-"| tail -1 |sed 's/php//' | sed 's/./&./1'`
+fi
 msg () {
     if [ $IMODE = n ]; then
         TERM=ansi whiptail --title "Info" --msgbox "$1" 8 52
@@ -19,39 +26,25 @@ msg "Current php version: $phpver"
 
 if [ $IMODE = n ]; then
     # Legacy/Main Menu
-    PKGP="debconf-apt-progress -- apt purge -y"
+    PKGD="debconf-apt-progress -- apt purge -y"
 
     #Menu
-    if (whiptail --title "Set new php version?" --yesno "Install php version $PPAversion ?" 8 78); then
-        newphpver=$PPAversion
+    if (whiptail --title "Set new php version?" --yesno "Install php version $RepoVersion ?" 8 78); then
+        newphpver=$RepoVersion
     else
         newphpver=$(whiptail --inputbox "Please enter the version to install" --title "Custom" 8 39 3>&1 1>&2 2>&3)
     fi
-
-    #Install
-     apt list --installed | less | grep php$phpver | cut -f1 -d"/" | sed "s/$phpver/$newphpver/"  | xargs $PKGI
-
-    #Config
-    cp /etc/php/$phpver/fpm/pool.d/* /etc/php/$newphpver/fpm/pool.d/
-
-    #Purge
-    if (whiptail --title "Set new php version?" --yesno "Remove php $phpver ?" 8 78); then
-       PhpPurge=1
-       $PKGP -y php$phpver*
-    else
-       PhpPurge=0
-    fi
 fi
 
 if [ $IMODE = l ]; then
     # Legacy/Main Menu
-    PKGP="apt purge -y"
+    PKGD="apt purge -y"
 
     #Menu    
     while true; do
-        read -p "Set phpversion to version $PPAversion ? -> yes/no?" yn
+        read -p "Set phpversion to version $RepoVersion ? -> yes/no?" yn
         case $yn in
-            [Yy]* ) newphpver=$PPAversion
+            [Yy]* ) newphpver=$RepoVersion
             break;;
             [Nn]* ) echo "";
             echo "Please enter php version to install:";read newphpver
@@ -59,18 +52,56 @@ if [ $IMODE = l ]; then
             * ) echo "Choose yes or no.";;
         esac
     done
-    
+ fi   
+
+    #Genereating vars for new php version
+    if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+    # Debian/Ubunbtu Php variables
+        newphpPoolDir=/etc/php/${newphpver}/fpm/pool.d
+        newphpPkgName=php${newphpver}
+        newphpMainConf=/etc/php/${newphpver}/fpm/php.ini
+        newphpFPMService=php${newphpver}-fpm
+        PKGP=$PKGD
+        apt list --installed | less | grep php$phpver | cut -f1 -d"/" | sed "s/$phpPkgName/$newphpPkgName/" > /tmp/pkg.list
+    elif [ "$shortdist" = "el8" ]; then
+    # Centos Php variable
+        newphpPoolDir=/etc/opt/remi/php${newphpver//.}/php-fpm.d/
+        newphpPkgName=php${newphpver//.}-php
+        newphpMainConf=/etc/opt/remi/php${newphpver//.}/php.ini
+        newphpFPMService=php${newphpver//.}-php-fpm
+        PKGP="dnf remove -y"
+        dnf list --installed | sort | grep $phpPkgName | awk '{print $1;}' | cut -f1 -d"." | sed "s/$phpPkgName/$newphpPkgName/" > /tmp/pkg.list
+    fi
+
     #Install
-    apt list --installed | less | grep php$phpver | cut -f1 -d"/" | sed "s/$phpver/$newphpver/"  | xargs $PKGI
+    
+    if [ ${newphpver//.} -ge 80 ] && [ ${newphpver//.}  -lt 90 ]; then
+        sed -i -e "s/$newphpPkgName-xmlrpc//g" -e "s/$newphpPkgName-json//g" /tmp/pkg.list
+    fi
+    cat /tmp/pkg.list | xargs $PKGI
 
     #Config
-    cp /etc/php/$phpver/fpm/pool.d/* /etc/php/$newphpver/fpm/pool.d/
+    systemctl stop $newphpFPMService
+    cp $phpPoolDir/* $newphpPoolDir 
     
+
+if [ $IMODE = n ]; then
+    #Purge
+    if (whiptail --title "Set new php version?" --yesno "Remove php $phpver ?" 8 78); then
+       PhpPurge=1
+       $PKGP -y $phpPkgName*
+    else
+       PhpPurge=0
+    fi
+fi
+
+
+if [ $IMODE = l ]; then    
     #Purge
     while true; do
         read -p "Remove php $phpver ? -> yes/no?" yn
         case $yn in
-            [Yy]* ) PhpPurge=1 ; $PKGP php$phpver*
+            [Yy]* ) PhpPurge=1 ; $PKGP $phpPkgName*
             break;;
             [Nn]* ) PhpPurge=0 ; echo ""
             break;;
@@ -79,13 +110,23 @@ if [ $IMODE = l ]; then
     done    
 fi
 
-for f in /etc/php/$newphpver/fpm/pool.d/*; do
+for f in $newphpPoolDir/*; do
     sed -i  "s/$phpver/$newphpver/" $f
+    sed -i  "s/${phpver//.}/${newphpver//.}/" $f
 done
-systemctl reload php$newphpver-fpm
+
+systemctl start $newphpFPMService
+systemctl enable $newphpFPMService
+
 
 sed -i "/phpver/c\phpver=\"$newphpver\"" /etc/ICTM/mainvar.list
 
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/phpupdate-handeler.sh; then
- source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/phpupdate-handeler.sh)
+mv /etc/ICTM/phpvar.list /etc/ICTM/phpvar"$phpver".list
+for storeme in newphpPoolDir newphpPkgName newphpMainConf newphpFPMService; do
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/phpvar.list
+done
+sed -i 's/new//' /etc/ICTM/phpvar.list
+
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/phpupdate-handeler.sh; then
+ source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/phpupdate-handeler.sh)
 fi

README.md

@@ -1,17 +1,41 @@
-# Ubuntu-Web-V2
-**Get Started with the graphical installer**:  
+# Web-V2
+## Geting started
+**Default/Graphical installer**:  
+Using curl
 ```
-wget https://git.ictmaatwerk.com/bprieshof/UBU-Web-V2/raw/branch/master/installer.sh -O /tmp/installer.sh  
+curl https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -o /tmp/installer.sh  
 bash /tmp/installer.sh
 ```  
 
-**Legacy Installer for developing and debugging**:
+Using wget
 ```
-wget https://git.ictmaatwerk.com/bprieshof/UBU-Web-V2/raw/branch/master/installer.sh -O /tmp/installer.sh  
+wget https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -O /tmp/installer.sh  
+bash /tmp/installer.sh
+```  
+
+**Legacy Installer for developing and debugging**:  
+Using curl
+```
+curl https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -o /tmp/installer.sh  
 bash /tmp/installer.sh -l 2>&1 | tee ~/output.log 
+```  
+
+Using wget
+```
+wget https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -O /tmp/installer.sh  
+bash /tmp/installer.sh -l 2>&1 | tee ~/output.log 
+```  
+## Adding extra CMS/Site after instalation
+```
+bash <(curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/AppendCMS.sh)
 ```
 
-#### This script uses the following repo's as dependencies:
+## Adding extra Module after instalation
+```
+bash <(curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/AppendModule.sh)
+```
+
+### This script uses the following repo's as dependencies:
 ```
 * VPS-scripts/Unattended-Security-Updates 
 * VPS-scripts/Ubuntu-MySQL

Scripts/EnableSSL.sh

@@ -4,13 +4,13 @@ source /etc/ICTM/mainvar.list
 sitename=CONFname
 domain=DOMAINname
 domainwww=DomainWWW
-email=Email
 webserv=WebServer
 webservice=WebServer
 
 #Correcting service name for Apache
-if [ $webservice = apache ]; then
-    webservice=apache2
+if [ $webservice = apache ]; then\
+    source /etc/ICTM/apachevar.list
+    webservice="$apacheService"
     ext=.conf
 fi
 
@@ -27,24 +27,27 @@ systemctl reload $webservice
 
 #Enabling SSL
 if [ $domainwww = 1 ]; then
-   certbot --"$webserv" certonly -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
+    certsatus=$?
 elif [ $domainwww = 0 ]; then
-   certbot --"$webserv" certonly -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
-fi  
+    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webserv" --ocsp --keylength 'ec-384' -d "$domain"
+    certsatus=$?
+fi
+  
+if test $certsatus -eq 0
+then
+	site_ext="ssl"
+else
+	site_ext="nossl"
+    rm -rf /etc/acmesh/certs/$domain*
+    echo "LE failed, restoring configuration"
+fi
+unset certsatus
 
 #Restoring config
-sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e "/#ConfHere1/ r /tmp/"$sitename"-config" -e '/#ConfHere/c\' /etc/"$webservice"/sites-available/"$sitename"_ssl"$ext"
-source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e "/#ConfHere1/ r /tmp/"$sitename"-config" -e '/#ConfHere/c\' /etc/"$webservice"/sites-available/"$sitename"_"$site_ext""$ext"
+source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
 
-#Remove script
-while true; do
-    read -p "Remove this script -> yes/no?" yn
-    case $yn in
-        [Nn]* )
-        break;;
-        [Yy]* )
-        rm -- "$0"
-        break;;
-        * )echo "Choose yes or no.";;
-    esac
-done
+if [ $site_ext = ssl ]; then
+rm -- "$0"
+fi

Scripts/GenerateApacheList.sh

@@ -0,0 +1,19 @@
+if [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
+source /etc/ICTM/mainvar.list
+if [ -z $shortdist ] ; then source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/MicroOSDetect.sh) ; fi
+
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+# Debian/Ubunbtu apache variables
+    apacheConfDir=/etc/apache2
+    apacheService=apache2
+
+elif [ "$shortdist" = "el8" ]; then
+# Centos Php variable
+    apacheConfDir=/etc/httpd
+    apacheService=httpd
+fi
+
+#Storing vars to config
+for storeme in apacheService apacheConfDir; do
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/apachevar.list
+done

Scripts/GeneratePhplist.sh

@@ -0,0 +1,23 @@
+if [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
+source /etc/ICTM/mainvar.list
+if [ -z $shortdist ] ; then source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/MicroOSDetect.sh) ; fi
+
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+# Debian/Ubunbtu Php variables
+    phpPoolDir=/etc/php/${phpver}/fpm/pool.d
+    phpPkgName=php${phpver}
+    phpMainConf=/etc/php/${phpver}/fpm/php.ini
+    phpFPMService=php${phpver}-fpm
+
+elif [ "$shortdist" = "el8" ]; then
+# Centos Php variable
+    phpPoolDir=/etc/opt/remi/php${phpver//.}/php-fpm.d/
+    phpPkgName=php${phpver//.}-php
+    phpMainConf=/etc/opt/remi/php${phpver//.}/php.ini
+    phpFPMService=php${phpver//.}-php-fpm
+fi
+
+#Storing vars to config
+for storeme in phpPoolDir phpPkgName phpMainConf phpFPMService; do
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/phpvar.list
+done

Scripts/MicroOSDetect.sh

@@ -0,0 +1,14 @@
+dist_ver=$(grep --color=never -Po "^VERSION_ID=\K.*" "/etc/os-release")
+dist=$(grep --color=never -Po "^ID=\K.*" "/etc/os-release")
+    
+if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then
+    shortdist=ubu1804
+    elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then
+    shortdist=ubu2004 
+elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
+    shortdist=deb10
+elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
+    shortdist=el8
+else
+    echo "This os in known"
+fi

Scripts/SMI.sh

@@ -12,7 +12,7 @@ SMI_config=no
 SMI_ModuleName=<ModuleName>
 
 #Enforcing Legacy Mode
-PKGM="apt"
+APTMODE="apt"
 OUTPUT='/dev/tty'
 IMODE=l
 
@@ -23,20 +23,58 @@ sslenable=1
 password=TestP@ssword123
 email=test@mail.local
 webserv=nginx
+#PackageManager-config
+
+dist_ver=$(grep --color=never -Po "^VERSION_ID=\K.*" "/etc/os-release")
+dist=$(grep --color=never -Po "^ID=\K.*" "/etc/os-release")
+
+if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then
+ PKGM="$APTMODE"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=ubu1804
+elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then
+ echo "Ubuntu 20.04 is not yet fully tested, not recommended for production server"
+ PKGM="$APTMODE"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=ubu2004 
+elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
+ echo "Debian 10 Detected"
+ PKGM="$APTMODE"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=deb10
+elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
+ echo "Centos 8 Detected"
+ PKGM="dnf"
+ PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y"
+ PKGLIST="dnf"
+ shortdist=el8
+ echo "This OS is not supported"
+ exit
+else
+ echo "This OS is not supported"
+ exit
+fi
+
+unset dist_ver dist APTMODE
+
 
 #Repo Vars
-repo=https://git.ictmaatwerk.com/bprieshof/UBU-Web-V2
+repo=https://git.ictmaatwerk.com/VPS-scripts/Web-V2
 branch=master
+branchtype=branch
 
 ###Select Module type
 ##Uncomment for CoreModules
-mtype=""$repo"/raw/branch/"$branch"/CoreModules/"$SMI_ModuleName""
+mtype=""$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$SMI_ModuleName""
 ##Uncomment for SubModules
-#mtype=""$repo"/raw/branch/"$branch"/SubModules/"$SMI_ModuleName""
+#mtype=""$repo"/raw/"$branchtype"/"$branch"/SubModules/"$SMI_ModuleName""
 ##Uncomment for CMS
-#mtype=""$repo"/raw/branch/"$branch"/CMS/"$SMI_ModuleName""
+#mtype=""$repo"/raw/"$branchtype"/"$branch"/CMS/"$SMI_ModuleName""
 ##Uncomment for External Module
-#mtype=""$repo"/raw/branch/"$branch""
+#mtype=""$repo"/raw/"$branchtype"/"$branch""
 
 #SelfBuilding Vars
 PKGI="${PKGM} install -y"
@@ -62,31 +100,42 @@ fi
 ##--------------------------##
 
 msg "              Starting installer" 8 78
-$PKGM update > $OUTPUT 2>&1
+$PKGUC > $OUTPUT 2>&1
 $PKGI curl > $OUTPUT 2>&1
 
 
 ##-------------------------##
 #    Generating APT list    #
 ##-------------------------##
-#General aptList
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$webserv"-apt.list; then
- curl "$mtype"/"$webserv"-apt.list >>/tmp/apt.list
+#Remove existing pkgList
+rm -f /tmp/pkg.list
+
+#General pkgList
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/generic.pkg.list; then
+ curl "$mtype"/generic.pkg.list >>/tmp/pkg.list
 fi
-#Webserver specific aptList
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/apt.list; then
- curl "$mtype"/apt.list >>/tmp/apt.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$PKGLIST".pkg.list; then
+ curl "$mtype"/"$PKGLIST".pkg.list >>/tmp/pkg.list
 fi
 
+#Webserver specific pkgList
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$webserv"-generic.pkg.list; then
+ curl "$mtype"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
+ printf " " >>/tmp/pkg.list
+fi
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$webserv"-"$PKGLIST".pkg.list; then
+ curl "$mtype"/"$webserv"-"$PKGLIST".pkg.list >>/tmp/pkg.list
+ printf " " >>/tmp/pkg.list
+fi
 
 ##--------------------##
 #   Pre-Requirements   #
 ##--------------------## 
 
 msg "                Preconfiguring"
-$PKGI software-properties-common gnupg > $OUTPUT 2>&1
-$PKGM update
-$PKGM upgrade -y
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
+$PKGUC
+$PKGUP
 
 
 ##-------------------##
@@ -106,9 +155,9 @@ fi
 #   Installer   #
 ##-------------##
 
-$PKGM update
-sed -i 's/PHPver/'$phpver'/g' /tmp/apt.list
-cat /tmp/apt.list | xargs $PKGI
+$PKGUC
+sed -i 's/PHPprefix/'$phpPkgName'/g' /tmp/pkg.list
+cat /tmp/pkg.list | xargs $PKGI
 
 
 ##---------------##

Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh

@@ -20,13 +20,13 @@ if [ -n "$1" ]; then
     if [[ "$1" = "-d" && "$PhpMA" != 0 ]]; then
         echo "Disable PhpMyadmin"
         sed -i '/PhpMA=/c\PhpMA=0' /etc/ICTM/toggle.conf
-        sed -i --follow-symlinks '/#enables\/disables PHPMyadmin/!b;n;cdeny from all' /etc/apache2/sites-enabled/010-Backend.conf
-        systemctl reload apache2
+        sed -i --follow-symlinks '/#enables\/disables PHPMyadmin/!b;n;cdeny from all' /APADIR/sites-enabled/010-Backend.conf
+        systemctl reload APASRV
     elif [[ "$1" = "-e" && "$PhpMA" !=  1 ]]; then
         echo "Enable PhpMyadmin"
         sed -i '/PhpMA=/c\PhpMA=1' /etc/ICTM/toggle.conf
-        sed -i --follow-symlinks '/#enables\/disables PHPMyadmin/!b;n;c#deny from all' /etc/apache2/sites-enabled/010-Backend.conf
-        systemctl reload apache2
+        sed -i --follow-symlinks '/#enables\/disables PHPMyadmin/!b;n;c#deny from all' /APADIR/sites-enabled/010-Backend.conf
+        systemctl reload APASRV
     elif [[ "$1" = "-h" ]]; then
         usage
     else

SubModules/php-fpm/apt.list

@@ -1 +0,0 @@
-phpPHPver-imagick php-pear phpPHPver-cli  phpPHPver-fpm phpPHPver-mysql phpPHPver-cgi phpPHPver-common phpPHPver-mbstring phpPHPver-curl phpPHPver-gd phpPHPver-intl phpPHPver-soap phpPHPver-xml phpPHPver-xmlrpc phpPHPver-zip 

SubModules/php-fpm/conf.sh

@@ -1,17 +1,32 @@
-systemctl stop php${phpver}-fpm 
+systemctl stop $phpFPMService
 ###############
 #   PHP-FPM   #
 ###############
 
-sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php/"$phpver"/fpm/php.ini
-sed -i 's/;opcache.memory_consumption=128/opcache.memory_consumption=256/g' /etc/php/"$phpver"/fpm/php.ini
-sed -i 's/;opcache.enable=1/opcache.enable=1/g' /etc/php/"$phpver"/fpm/php.ini
-sed -i 's/;opcache.interned_strings_buffer=8/opcache.interned_strings_buffer=8/g' /etc/php/"$phpver"/fpm/php.ini
-sed -i 's/;opcache.max_accelerated_files=10000/opcache.max_accelerated_files=50000/g' /etc/php/"$phpver"/fpm/php.ini
-sed -i 's/;opcache.max_wasted_percentage=5/opcache.max_wasted_percentage=5/g' /etc/php/"$phpver"/fpm/php.ini
-sed -i 's/;opcache.revalidate_freq=2/opcache.revalidate_freq=0/g' /etc/php/"$phpver"/fpm/php.ini
-sed -i 's/; max_input_vars = 1000/max_input_vars = 10000/g' /etc/php/"$phpver"/fpm/php.ini
-sed -i 's/upload_max_filesize = 2/upload_max_filesize = 128/g' /etc/php/"$phpver"/fpm/php.ini
-sed -i 's/post_max_size = 8/post_max_size = 64/g' /etc/php/"$phpver"/fpm/php.ini
+sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' "$phpMainConf"
+sed -i 's/;opcache.memory_consumption=128/opcache.memory_consumption=256/g' "$phpMainConf"
+sed -i 's/;opcache.enable=1/opcache.enable=1/g' "$phpMainConf"
+sed -i 's/;opcache.interned_strings_buffer=8/opcache.interned_strings_buffer=8/g' "$phpMainConf"
+sed -i 's/;opcache.max_accelerated_files=10000/opcache.max_accelerated_files=50000/g' "$phpMainConf"
+sed -i 's/;opcache.max_wasted_percentage=5/opcache.max_wasted_percentage=5/g' "$phpMainConf"
+sed -i 's/;opcache.revalidate_freq=2/opcache.revalidate_freq=0/g' "$phpMainConf"
+sed -i 's/; max_input_vars = 1000/max_input_vars = 10000/g' "$phpMainConf"
+sed -i 's/upload_max_filesize = 2/upload_max_filesize = 128/g' "$phpMainConf"
+sed -i 's/post_max_size = 8/post_max_size = 64/g' "$phpMainConf"
+
+
+if [ "$shortdist" = "el8" ]; then
+# Centos Mysql config
+echo "pdo_mysql.default_socket = '/var/run/mysqld/mysqld.sock'" >> /etc/opt/remi/php${phpver//.}/php.d/60-mysql_sock.ini
+echo "mysql.default_socket = '/var/run/mysqld/mysqld.sock'" >> /etc/opt/remi/php${phpver//.}/php.d/60-mysql_sock.ini
+echo "mysqli.default_socket = '/var/run/mysqld/mysqld.sock'" >> /etc/opt/remi/php${phpver//.}/php.d/60-mysql_sock.ini
+echo "d /run/php              0755 www-data www-data -   -" > /usr/lib/tmpfiles.d/php-custom.conf
+#Centos php Bin 
+sudo ln -s /usr/bin/php${phpver//.} /usr/bin/php
+#Centos SeLinux
+setsebool -P httpd_can_network_connect 1
+fi
+
+systemctl start $phpFPMService
+systemctl enable $phpFPMService
 
-systemctl start php${phpver}-fpm

SubModules/php-fpm/php7x/apt.php.pkg.list

@@ -0,0 +1 @@
+php-pear PHPprefix-mysql

SubModules/php-fpm/php7x/dnf.php.pkg.list

@@ -0,0 +1 @@
+PHPprefix-pear PHPprefix PHPprefix-mysqlnd

SubModules/php-fpm/php7x/generic.php.pkg.list

@@ -0,0 +1 @@
+PHPprefix-imagick PHPprefix-cli PHPprefix-apcu PHPprefix-fpm PHPprefix-cgi PHPprefix-common PHPprefix-mbstring PHPprefix-curl PHPprefix-gd PHPprefix-intl PHPprefix-soap PHPprefix-xml PHPprefix-xmlrpc PHPprefix-zip 

SubModules/php-fpm/php8x/apt.php.pkg.list

@@ -0,0 +1 @@
+php-pear PHPprefix-mysql

SubModules/php-fpm/php8x/dnf.php.pkg.list

@@ -0,0 +1 @@
+PHPprefix-pear PHPprefix PHPprefix-mysqlnd

SubModules/php-fpm/php8x/generic.php.pkg.list

@@ -0,0 +1 @@
+PHPprefix-imagick PHPprefix-cli PHPprefix-apcu PHPprefix-fpm PHPprefix-cgi PHPprefix-common PHPprefix-mbstring PHPprefix-curl PHPprefix-gd PHPprefix-intl PHPprefix-soap PHPprefix-xml PHPprefix-zip 

SubModules/php-fpm/preconf.sh

@@ -0,0 +1,39 @@
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+# Debian/Ubunbtu Php variables
+    phpPoolDir=/etc/php/${phpver}/fpm/pool.d
+    phpPkgName=php${phpver}
+    phpMainConf=/etc/php/${phpver}/fpm/php.ini
+    phpFPMService=php${phpver}-fpm
+
+elif [ "$shortdist" = "el8" ]; then
+# Centos Php variable
+    phpPoolDir=/etc/opt/remi/php${phpver//.}/php-fpm.d/
+    phpPkgName=php${phpver//.}-php
+    phpMainConf=/etc/opt/remi/php${phpver//.}/php.ini
+    phpFPMService=php${phpver//.}-php-fpm
+#Creating Socket directory
+    mkdir -p /var/run/php
+fi
+
+#Setting php version branch 
+if [ ${phpver//.} -ge 70 ] && [ ${phpver//.} -lt 80 ]  ; then
+ phpVerBranch=7x
+elif [ ${phpver//.} -ge 80 ] && [ ${phpver//.}  -lt 90 ]; then
+ phpVerBranch=8x
+fi
+
+#Getting php pkglist
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/php-fpm/php"$phpVerBranch"/generic.php.pkg.list; then
+    curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/php-fpm/php"$phpVerBranch"/generic.php.pkg.list >>/tmp/pkg.list
+    printf " " >>/tmp/pkg.list
+fi
+
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/php-fpm/php"$phpVerBranch"/"$PKGLIST".php.pkg.list; then
+    curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/php-fpm/php"$phpVerBranch"/"$PKGLIST".php.pkg.list >>/tmp/pkg.list
+    printf " " >>/tmp/pkg.list
+fi
+
+#Storing vars to config
+for storeme in phpPoolDir phpPkgName phpMainConf phpFPMService phpVerBranch; do
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/phpvar.list
+done

SubModules/postfix/apt.pkg.list

@@ -0,0 +1 @@
+mailutils

SubModules/postfix/conf.sh

@@ -0,0 +1,18 @@
+##-------------##
+#    Postfix    #
+##-------------##
+
+sed -i 's/#inet_interfaces = all/inet_interfaces = loopback-only/g' /etc/postfix/main.cf
+sed -i 's/mydestination/#mydestination/g' /etc/postfix/main.cf
+sed -i 's/relayhost =/mydestination = '$hostname', localhost.'$hostname', '$hostname'/g' /etc/postfix/main.cf
+echo "bounce_notice_recipient = info@$domain" >> /etc/postfix/main.cf
+cat <<EOF > /etc/aliases
+# See man 5 aliases for format
+postmaster:    root
+root:          $email
+EOF
+newaliases
+
+systemctl start postfix 
+systemctl enable postfix
+systemctl reload postfix

SubModules/postfix/generic.pkg.list

@@ -0,0 +1 @@
+postfix

SubModules/postfix/preconf.sh

@@ -0,0 +1,13 @@
+if [ -z "${domain}" ]; then
+    if [ $IMODE = n ]; then
+        domain=$(whiptail --nocancel --inputbox "                        Enter the domain without WWW     " 11 82 --title "Config" 3>&1 1>&2 2>&3)
+    elif [ $IMODE = l ]; then
+        echo "Enter the domain without WWW:"
+        read domain
+    fi
+fi
+
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+    debconf-set-selections <<< "postfix postfix/mailname string $domain"
+    debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Internet Site'"
+fi

SubModules/redis/apt.list

@@ -1 +0,0 @@
-redis-server phpPHPver-redis

SubModules/redis/apt.pkg.list

@@ -0,0 +1 @@
+redis-server 

SubModules/redis/conf.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-systemctl enable --now redis-server
+systemctl enable --now $redisService