SubModule php-fpm: Relocated setup of php repo

Relocated it from generic CoreModule to the php-fpm SubModule

AppendCMS.sh

@@ -1,23 +1,40 @@
+#!/bin/bash
+
+###############################
+# @author: Bram Prieshof      #
+# @author: Branco van de Waal #
+###############################
+
+itype=AddCMS
+ScriptCompat=2
+
 ##-----------------##
 #   Fetching Vars   #
 ##-----------------##
 
-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
+if [ ! -f "/etc/WebV2/selopts.list" ] || [ ! -f "/etc/WebV2/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
+
+source /etc/WebV2/selopts.list
+source /etc/WebV2/mainvar.list
+if  [ -z ${CompatVer} ] || [ "$CompatVer" -lt "$ScriptCompat" ]; then   echo "Web-V2 is outdated, Please run the Compat-V*.sh updater from the repo, Current version= $CompatVer" && exit ; fi
 
-source /etc/ICTM/selopts.list
-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 [ $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
+    if [ ! -f "/etc/WebV2/phpvar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GeneratePhplist.sh) ; fi
-    source /etc/ICTM/phpvar.list
+    source /etc/WebV2/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
+    if [ ! -f "/etc/WebV2/apachevar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GenerateApacheList.sh) ; fi
-    source /etc/ICTM/apachevar.list
+    source /etc/WebV2/apachevar.list
 fi
 rm /tmp/pkg.list > $OUTPUT 2>&1
 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list)
 
+#SiteCount
+if [ ! -f "/etc/WebV2/sites.count" ]; then SiteCount=`expr $(ls -l /var/www | grep -c ^d) - 1` ; else source /etc/WebV2/sites.count; fi
+if [ -z ${SiteCount+x} ] ; then SiteCount=`expr $(ls -l /var/www | grep -c ^d) - 1` ; fi
+SiteCount=$(($SiteCount+1))
+
 #Setting Menulist to webserver
 declare -n CMSL="$webserv"CMSL
 declare -n options="$webserv"Options
@@ -27,8 +44,9 @@ declare -n options="$webserv"Options
 #    Static-Vars   #
 ##----------------##
 
-ignphpcms=1
+#Options var setup for enabled sub-modules
-
+EnOption="${SelectedOptions[@],,}" && EnOption="${EnOption// /}" && EnOption="${EnOption//:/ }" && EnOption="${EnOption//'"'}"
+EnOption="$EnOption""${EnabledAons[@]}"
 
 ##---------------##
 #    Functions    #
@@ -153,9 +171,16 @@ if [ $IMODE = l ]; then
     done
 fi
 
-#Cleaning options from menu
+#Cleaning CMS from menu
 CMS="${CMS//:}" && CMS="${CMS,,}"
 
+##-----------------##
+#   Storeing vars   #
+##-----------------##
+
+touch /etc/WebV2/sites/"$sitename"
+echo "SiteCount=$SiteCount" > /etc/WebV2/sites.count
+
 
 ##-----------##
 #   AptList   #
@@ -199,6 +224,23 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re
     source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-preconf.sh)
 fi
 
+#Preconfiguring module For CMS
+for val1 in ${EnOption[*]}; do
+    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/"$branchtype"/"$branch"/SubModules/"$val1"/CMSHook-preconf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/CMSHook-preconf.sh)
+        fi
+    else
+        #Fetching from remote repo
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"CMSHook-preconf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$modListed"CMSHook-preconf.sh)
+        fi
+    fi
+done
 
 ##-------------##
 #   Installer   #
@@ -236,6 +278,8 @@ msg "                Setting up SSL"
     if test $certsatus -eq 0
     then
         site_ext="ssl"
+        mkdir -p /etc/acmesh/inst/$domain
+        /opt/acmesh/acme.sh  --config-home '/etc/acmesh/data' --install-cert --ecc --domain $domain --cert-file /etc/acmesh/inst/$domain/cert.pem --key-file /etc/acmesh/inst/$domain/key.pem --ca-file /etc/acmesh/inst/$domain/ca.cer --fullchain-file /etc/acmesh/inst/$domain/fullchain.pem --reloadcmd 'systemctl reload $(cat /etc/WebV2/SslServices)'
     else
         site_ext="nossl"
         rm -rf /etc/acmesh/certs/$domain*
@@ -261,15 +305,26 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re
     source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-conf.sh)
 fi
 
-##--------------------------##
+#Configuring Module for CMS
-#   Backup-util Site Setup   #
+
-##--------------------------##
+for val1 in ${EnOption[*]}; do
+    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/"$branchtype"/"$branch"/SubModules/"$val1"/CMSHook-conf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/CMSHook-conf.sh)
+        fi
+    else
+        #Fetching from remote repo
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"CMSHook-conf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$modListed"CMSHook-conf.sh)
+        fi
+    fi
+done
+
 
-repobckutil=https://git.ictmaatwerk.com/VPS-scripts/Backup-Util
-branchbckutil=master
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repobckutil"/raw/branch/"$branchbckutil"/cms-handeler.sh; then
- source <(curl --retry 7 --retry-delay 5 -s "$repobckutil"/raw/branch/"$branchbckutil"/cms-handeler.sh)
-fi
 
 ##------------##
 #   Services   #

AppendModule.sh

@@ -1,23 +1,31 @@
-##-----------------##
+#!/bin/bash
-#   Fetching Vars   #
-##-----------------##
 
-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
+###############################
+# @author: Bram Prieshof      #
+# @author: Branco van de Waal #
+###############################
+
+itype=AddMod
+ScriptCompat=2
 
 ##-----------------##
 #   Fetching Vars   #
 ##-----------------##
 
-source /etc/ICTM/selopts.list
+if [ ! -f "/etc/WebV2/selopts.list" ] || [ ! -f "/etc/WebV2/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
-source /etc/ICTM/mainvar.list
+
+source /etc/WebV2/selopts.list
+source /etc/WebV2/mainvar.list
+if  [ -z ${CompatVer} ] || [ "$CompatVer" -lt "$ScriptCompat" ]; then   echo "Web-V2 is outdated, Please run the Compat-V*.sh updater from the repo, Current version= $CompatVer" && exit ; fi
+
 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
+    if [ ! -f "/etc/WebV2/phpvar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GeneratePhplist.sh) ; fi
-    source /etc/ICTM/phpvar.list
+    source /etc/WebV2/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
+    if [ ! -f "/etc/WebV2/apachevar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GenerateApacheList.sh) ; fi
-    source /etc/ICTM/apachevar.list
+    source /etc/WebV2/apachevar.list
 fi
 rm /tmp/pkg.list
 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list)
@@ -143,7 +151,7 @@ done
 option="${option%"${option##*[![:space:]]}"}"
 fi
 
-echo 'SelectedOptions+=('$option')' >> /etc/ICTM/selopts.list
+echo 'SelectedOptions+=('$option')' >> /etc/WebV2/selopts.list
 
 
 #Cleaning options from menu

CMS/Backend/Fpm-Pool.conf-unconfigured

@@ -5,10 +5,11 @@ listen = /var/run/php/phpPHPver-fpm-Backend.sock
 listen.owner = www-data
 listen.group = www-data
 php_admin_value[disable_functions] = exec,passthru,shell_exec,system
+php_value[session.save_path]    = /var/lib/php/sessions
 php_admin_value[opcache.enable] = 0      
 php_admin_value[max_input_vars] = 5000                                                                                                                                                                                                                                         
 php_admin_value[upload_max_filesize] = 256M                                                                                                                                                                                                                                    
-php_admin_value[post_max_size] = 16M                                                                                                                                                                                                                                           
+php_admin_value[post_max_size] = 256M                                                                                                                                                                                                                                           
 php_admin_value[max_input_time] = 15                                                                                                                                                                                                                                           
 php_admin_value[cgi.fix_pathinfo] = 0                                                                                                                                                                                                                                          
 php_admin_value[allow_url_fopen] = Off                                                                                                                                                                                                                                         

CMS/Backend/apache-siteBackend-unconfigured

@@ -20,4 +20,16 @@ Alias /backend/database /usr/share/phpmyadmin
 
 </Directory>
 
+<Location /backend/monit>
+    RewriteEngine on
+    RewriteRule /backend/monit /backend/monit/$1 [R]
+</Location>
+<Location /backend/monit/>
+    #enables/disables monit-websocket
+    deny from all
+    ProxyPass unix:/var/run/monit/monit.sock|http://127.0.0.1/
+    ProxyPassReverse unix:/var/run/monit/monit.sock|http://127.0.0.1/
+</Location>
+
+
 #endConf

CMS/Backend/conf.sh

@@ -3,6 +3,8 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/Backen
 sed -i 's/PHPver/'$phpver'/' "$phpPoolDir"/Backend.conf
 groupadd Backend
 useradd -g Backend Backend
+usermod -a -G www-data Backend
+
 #PHPMyAdmin configuration
 touch /var/log/PhpMyAdmin/PhpMyAdmin_auth.log
 chown Backend:Backend -R /usr/share/phpmyadmin
@@ -10,5 +12,6 @@ chown Backend:Backend -R /var/lib/phpmyadmin/tmp
 chown Backend:Backend -R /var/log/PhpMyAdmin
 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-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
+echo "0 0 * * * root bash /opt/toggle/toggle-PhpMyAdmin.sh -d > /dev/null 2>&1" >> /etc/cron.d/autodisablebackend
+echo "0 0 * * * root bash /opt/toggle/toggle-MonitWebui.sh -d > /dev/null 2>&1" >> /etc/cron.d/autodisablebackend

CMS/Backend/nginx-siteBackend-unconfigured

@@ -24,16 +24,23 @@ location = /backend/netdata {
     location /backend/database {
         deny all; #enables/disables PHPMyadmin
         index index.php index.html;
+        client_max_body_size 256m;
         alias /usr/share/phpmyadmin;
         location ~ \.php$ {
             include fastcgi_params;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             fastcgi_split_path_info ^(.+\.php)(/.+)$;
             fastcgi_pass unix:/var/run/php/phpPHPver-fpm-Backend.sock;
+            fastcgi_read_timeout 10m;
             fastcgi_index index.php;
         }
     }
     
+    location /backend/monit/ {
+        deny all; #enables/disables monit-websocket
+        proxy_pass http://unix:/var/run/monit/monit.sock:/;
+    }
+
     location ~ /\.ht {
         deny all;
     }

CMS/frontcontroller/Fpm-Pool.conf-unconfigured

@@ -0,0 +1,44 @@
+[SITEname]
+user = SITEname
+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[error_log] = /var/log/php-fpm/error-SITEname.log
+php_value[session.save_path]    = /var/lib/php/sessions
+
+; OPCACHE SETTINGS
+php_admin_value[opcache.memory_consumption] = 256
+php_admin_value[opcache.enable] = 0
+php_admin_value[opcache.interned_strings_buffer] = 32
+php_admin_value[opcache.max_accelerated_files] = 50000
+php_admin_value[opcache.max_wasted_percentage] = 5
+php_admin_value[opcache.revalidate_freq] = 0
+php_admin_value[opcache.validate_timestamps] = 1
+
+; PERFORMANCE LIMITS
+php_admin_value[max_input_vars] = 100
+php_admin_value[upload_max_filesize] = 32M
+php_admin_value[post_max_size] = 32M
+php_admin_value[max_input_time] = 15
+php_admin_value[max_execution_time] = 150
+
+
+; SECURITY
+php_admin_value[cgi.fix_pathinfo] = 1
+php_admin_value[allow_url_fopen] = On
+php_admin_value[file_uploads] = On
+php_admin_value[open_basedir] = /var/www/DOMAINname
+;php_admin_value[open_basedir] = /var/www/DOMAINname:/tmp
+php_admin_value[session.use_strict_mode] = 1
+php_admin_value[session.cookie_httponly] = 1
+;HTTPSONLY php_admin_value[session.cookie_samesite] = Strict
+;HTTPSONLY php_admin_value[session.cookie_secure] = 1
+
+pm = dynamic
+pm.max_children = 11
+pm.start_servers = 3
+pm.min_spare_servers = 3
+pm.max_spare_servers = 11
+chdir = /

CMS/frontcontroller/Nginx-unconfigured

@@ -0,0 +1,30 @@
+#beginConf
+
+    #access_log /var/log/nginx/SITEname-access.log;
+    error_log /var/log/nginx/SITEname-error.log;
+
+    index index.php index.html;
+    root /var/www/DOMAINname/public;
+    gzip on;
+    gzip_proxied any;
+    gzip_types text/plain text/css text/xml text/javascript application/javascript application/x-javascript image/svg image/svg+xml application/xml image/x-icon;
+    gzip_comp_level 2;
+    gzip_disable "msie6";
+    gzip_buffers 16 8k;
+    
+    #include snippets/ngx-backendredir.conf;
+
+    location / {
+        try_files $uri $uri/ $uri.html /index.php$is_args$query_string;
+    }
+    
+    location ~ \.php$ {
+        include snippets/fastcgi-php.conf;
+        fastcgi_pass unix:/var/run/php/phpPHPver-fpm-SITEname.sock;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+    
+#endConf

CMS/frontcontroller/conf.sh

@@ -0,0 +1,40 @@
+#Creating DB
+db_name="fc_$SiteCount"
+db_user="fc_$SiteCount"
+db_pass=$(tr -dc 'A-Za-z0-9!#%()*+,-.:;<=>?@[]^_{|}~' </dev/urandom | head -c 30 ; echo)
+
+#Storing DB Credentials
+echo "Database Name $db_name" > ~/DB_"$sitename"
+echo "Database Username $db_user" >> ~/DB_"$sitename"
+echo "Database Password $db_pass" >> ~/DB_"$sitename"
+
+#Setting up Database
+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
+mysql -u root -p"$password" -e "FLUSH PRIVILEGES;" > $OUTPUT 2>&1
+
+
+#Creating webfolder
+mkdir -p /var/www/"$domain"/public
+
+#Ceating content
+echo "<html><head></head><body>$webserv has been succsefully installed by the Wizard<br>Ready for FontControler installation</body></html>" > /var/www/$domain/public/index.html
+
+#Setup PHP Pool
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/frontcontroller/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"
+usermod -a -G www-data "$sitename"
+
+systemctl reload $phpFPMService
+
+#Setting Permsissions
+chown "$sitename":"$sitename" -R /var/www/"$domain"/
+
+if [ "$shortdist" = "el8" ]; then
+    #Setting SeLiux perms for centos
+    semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/$domain/(/.*)?" > $OUTPUT 2>&1
+    restorecon -r /var/www/ > $OUTPUT 2>&1
+fi

CMS/frontcontroller/nginx-conf.sh

@@ -0,0 +1,5 @@
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/frontcontroller/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"
+
+systemctl reload nginx

CMS/nextcloud/Fpm-Pool.conf-unconfigured

@@ -6,6 +6,8 @@ listen.owner = www-data
 listen.group = www-data
 php_admin_value[disable_functions] = exec,passthru,system
 php_admin_value[error_log] = /var/log/php-fpm/error-SITEname.log
+php_value[session.save_path]    = /var/lib/php/sessions
+
 ; OPCACHE SETTINGS
 php_admin_value[opcache.memory_consumption] = 256
 php_admin_value[opcache.enable] = 0
@@ -14,6 +16,8 @@ php_admin_value[opcache.max_accelerated_files] = 50000
 php_admin_value[opcache.max_wasted_percentage] = 5
 php_admin_value[opcache.revalidate_freq] = 0
 php_admin_value[opcache.validate_timestamps] = 1
+php_admin_value[opcache.interned_strings_buffer] = 64
+
 
 ; PERFORMANCE LIMITS
 php_admin_value[max_input_vars] = 1000

CMS/nextcloud/Nginx-unconfigured

@@ -20,7 +20,7 @@ gzip_vary on;
 gzip_comp_level 4;
 gzip_min_length 256;
 gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
-gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
+gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
 
 location = /robots.txt {
     allow all;
@@ -28,13 +28,14 @@ location = /robots.txt {
     access_log off;
 }
 
-location = /.well-known/carddav {
+location ^~ /.well-known {
-    return 301 $scheme://$host:$server_port/remote.php/dav;
+    location = /.well-known/carddav     { return 301 /remote.php/dav/; }
-}
+    location = /.well-known/caldav      { return 301 /remote.php/dav/; }
-location = /.well-known/caldav {
+    location ^~ /.well-known            { return 301 /index.php$uri; }
-    return 301 $scheme://$host:$server_port/remote.php/dav;
+    try_files $uri $uri/ =404;
 }
 
+
 location / {
     rewrite ^ /index.php;
 }
@@ -66,7 +67,7 @@ location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) {
     index index.php;
 }
 
-location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
+location ~ \.(?:css|js|svg|gif|png|jpg|ico|wasm|tflite|map)$ {
     try_files $uri /index.php$request_uri;
     add_header Cache-Control "public, max-age=15778463";
     add_header Referrer-Policy "no-referrer" always;
@@ -74,10 +75,30 @@ location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
     add_header X-Permitted-Cross-Domain-Policies "none" always;
     add_header X-Robots-Tag "none" always;
     access_log off;
+    location ~ \.wasm$ {
+        default_type application/wasm;
+    }
 }
 
-location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
+location ~ \.woff2?$ {
+    try_files $uri /index.php$request_uri;
+    expires 7d;
+    access_log off;
+}
+
+location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$ {
     try_files $uri /index.php$request_uri;
     access_log off;
 }
+
+## Reverse proxy Config for 'Files High Performance Back-end'
+#FHPBlocation ^~ /push/ {
+#FHPB    proxy_pass http://127.0.0.1:7867/;
+#FHPB    proxy_http_version 1.1;
+#FHPB    proxy_set_header Upgrade $http_upgrade;
+#FHPB    proxy_set_header Connection "Upgrade";
+#FHPB    proxy_set_header Host $host;
+#FHPB    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#FHPB}
+
 #endConf

CMS/nextcloud/conf.sh

@@ -3,6 +3,7 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcl
 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"
+usermod -a -G www-data "$sitename"
 mkdir -p /var/www/"$domain"/html/data
 
 #Getting Nextcloud
@@ -12,9 +13,8 @@ cp -a /tmp/nextcloud/. /var/www/"$domain"/html
 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_$SiteCount"
-db_name="nextcloud_$db_suffix"
+db_user="nextcloud_$SiteCount"
-db_user="nextcloud_$db_suffix"
 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
@@ -42,9 +42,22 @@ 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
+    restorecon -r /var/www/ > $OUTPUT 2>&1
 fi
 
+#Enable PHP-ACPU on CLI
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
+  if ! grep -Fxq "apc.enable_cli=1" /etc/php/${phpver}/mods-available/apcu.ini; then
+      echo "apc.enable_cli=1" >> /etc/php/${phpver}/mods-available/apcu.ini
+  fi
+elif [ "$shortdist" = "el8" ]; then
+  sed -i "/apc.enable_cli/c\apc.enable_cli=1" /etc/opt/remi/php${phpver//.}/php.d/40-apcu.ini
+fi
+
+#PHP 8.0 Settings
+if [ "$phpVerBranch" = "8x" ]; then  
+  sed -i "/opcache.enable/c\php_admin_value[opcache.enable] = 1" "$phpPoolDir"/"$sitename".conf
+fi
 
 #Makeing nextcloud Finalize script and setting login Notice
 curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/nextcloud-init.sh -o ~/NextcloudInit-"$sitename".sh

CMS/nextcloud/nextcloud-init.sh

@@ -4,16 +4,32 @@ sudo -u SITEname php /var/www/DOMAINname/html/occ app:disable firstrunwizard
 
 sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set default_language --value=nl
 sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set default_locale --value=nl
+sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set default_phone_region --value=nl
 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'
+sudo -u SITEname php /var/www/DOMAINname/html/occ config:system:set trashbin_retention_obligation --value=30,30
 
 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
+    while true; do
+    read -p "Prepair for Files High Performance Back-end (Only for nginx) -> yes/no?" yn
+    case $yn in
+        [Nn]* )
+        break;;
+        [Yy]* )
+        sudo -u SITEname php /var/www/DOMAINname/html/occ app:install notify_push
+        sed -i --follow-symlinks 's/#FHPB//g' /etc/nginx/sites-enabled/SITEname
+        systemctl reload nginx
+        echo -e "\e[96m Run: sudo -u SITEname php /var/www/DOMAINname/html/occ notify_push:setup\e[39m"
+        break;;
+        * )echo "Choose yes or no.";;
+        esac
+    done
 else 
-    echo "Redis  running on this system" 
+    echo "Redis is not running on this system" 
 fi
 
 echo "*/5  *  *  *  * SITEname	php -f /var/www/DOMAINname/html/cron.php > /dev/null 2>&1" >> /etc/crontab

CMS/none/Fpm-Pool.conf-unconfigured

@@ -6,6 +6,8 @@ listen.owner = www-data
 listen.group = www-data
 php_admin_value[disable_functions] = exec,passthru,shell_exec,system
 php_admin_value[error_log] = /var/log/php-fpm/error-SITEname.log
+php_value[session.save_path]    = /var/lib/php/sessions
+
 ; OPCACHE SETTINGS
 php_admin_value[opcache.memory_consumption] = 256
 php_admin_value[opcache.enable] = 0

CMS/none/conf.sh

@@ -12,15 +12,16 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/none/F
 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"
+usermod -a -G www-data "$sitename"
 
 systemctl reload $phpFPMService
+fi
 
 #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
+    restorecon -r /var/www/ > $OUTPUT 2>&1
 fi

CMS/wordpress/Fpm-Pool.conf-unconfigured

@@ -6,6 +6,8 @@ listen.owner = www-data
 listen.group = www-data
 php_admin_value[error_log] = /var/log/php-fpm/error-SITEname.log
 php_admin_value[disable_functions] = exec,passthru,shell_exec,system
+php_value[session.save_path]    = /var/lib/php/sessions
+
 ; OPCACHE SETTINGS
 php_admin_value[opcache.memory_consumption] = 256
 php_admin_value[opcache.enable] = 0

CMS/wordpress/conf.sh

@@ -6,9 +6,8 @@ if [ ! -f /usr/local/bin/wp ]; then
 fi
 
 #Creating DB
-db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`
+db_name="wp_$SiteCount"
-db_name="wp_$db_suffix"
+db_user="wp_$SiteCount"
-db_user="wp_$db_suffix"
 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/)
 
@@ -37,6 +36,7 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpr
 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"
+usermod -a -G www-data "$sitename"
 
 systemctl reload $phpFPMService
 
@@ -54,7 +54,7 @@ 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
+    restorecon -r /var/www/ > $OUTPUT 2>&1
 fi
 
 #Makeing wordpress Finalize script and setting login Notice

CMS/wordpress/wordpress-init.sh

@@ -2,10 +2,10 @@ 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 plugin install https://mirror.lan/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"
+#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//_}
 

CoreModules/apache/conf.sh

@@ -4,11 +4,12 @@ systemctl stop $apacheService > $OUTPUT 2>&1
 #   Apache   #
 ##############
 
-if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; 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
+	a2enmod actions fcgid alias proxy_fcgi proxy_http ssl headers http2 setenvif socache_shmcb rewrite > $OUTPUT 2>&1
 	mkdir -p "$apacheConfDir"/snippets/
+	monitconf=/etc/monit/monitrc
 elif [ "$shortdist" = "el8" ]; then
 	echo 'IncludeOptional conf-enabled/*.conf' >>/etc/httpd/conf/httpd.conf
 	echo 'IncludeOptional sites-enabled/*.conf' >>/etc/httpd/conf/httpd.conf
@@ -18,6 +19,7 @@ elif [ "$shortdist" = "el8" ]; then
     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
+	monitconf=/etc/monitrc
 fi
 
 curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/snippets-ssl.conf -o "$apacheConfDir"/snippets/apa-ssl.conf
@@ -54,16 +56,21 @@ ln -s "$apacheConfDir"/sites-available/Backend_nossl.conf "$apacheConfDir"/sites
 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
 
-
+#BackendToggle
 mkdir -p /opt/toggle
+##Phpmyadmin
 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
-
+##monit
- 
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-Monit_APACHE.sh -o /opt/toggle/toggle-MonitWebui.sh
-
+sed -i -e 's#MONITCONF#'$monitconf'#' -e 's/APASRV/'$apacheService'/' -e 's#APADIR#'$apacheConfDir'#' /opt/toggle/toggle-MonitWebui.sh
+unset monitconf
 
 # custom Welcome page
 echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /var/www/html/index.html
 
+#Add Apache as SSL service
+echo "$apacheService" >> /etc/WebV2/SslServices
+
 systemctl start $apacheService > $OUTPUT 2>&1
 systemctl enable $apacheService > $OUTPUT 2>&1

CoreModules/apache/config/apache2/site_ssl-unconfigured

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

CoreModules/apache/config/apache2/site_ssl-wwwredir

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

CoreModules/apache/phpupdate-handeler.sh

@@ -1,5 +1,5 @@
-if [ ! -f "/etc/ICTM/apachevar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GenerateApacheList.sh) ; fi
+if [ ! -f "/etc/WebV2/apachevar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GenerateApacheList.sh) ; fi
-source /etc/ICTM/apachevar.list
+source /etc/WebV2/apachevar.list
 
 for f in $apacheConfDir/sites-available/*; do
     if [ $IMODE = n ] && [ $PhpPurge = 0 ]; then

CoreModules/apache/preconf.sh

@@ -1,4 +1,4 @@
-if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
 # Debian/Ubunbtu apache variables
     apacheConfDir=/etc/apache2
     apacheService=apache2
@@ -11,7 +11,7 @@ fi
 
 #Storing vars to config
 for storeme in apacheService apacheConfDir; do
-    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/apachevar.list
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/WebV2/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
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=apache osrel=$shortdist bash > $OUTPUT 2>&1 > $OUTPUT 2>&1

CoreModules/generic/preconf.sh

@@ -1,4 +1,4 @@
-if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
 ########################
 #    Debian/Ubunbtu    #
 ########################
@@ -6,7 +6,7 @@ if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist
     #  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
+    curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=universe osrel=$shortdist bash > $OUTPUT 2>&1
     ##------------##
     #    System    #
     ##------------##
@@ -39,7 +39,7 @@ elif [ "$shortdist" = "el8" ]; then
     #  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
+    curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=epel osrel=$shortdist bash > $OUTPUT 2>&1
 
     ##------------##
     #    System    #
@@ -65,13 +65,7 @@ fi
 #  Prerequisite packages  #
 ##-----------------------##
 
-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
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
-
-
-##--------------##
-#  Repositories  #
-##--------------##
-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
 
 
 ##------------##

CoreModules/nginx/conf.sh

@@ -36,12 +36,26 @@ ln -s /etc/nginx/sites-available/Backend_nossl /etc/nginx/sites-enabled/Backend
 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 
 
+#toggles
 mkdir -p /opt/toggle
+##phpmyadmin toggle
 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
+##monit toggle
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
+    monitconf=/etc/monit/monitrc
+elif [ "$shortdist" = "el8" ]; then
+    monitconf=/etc/monitrc
+fi
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-Monit_NGINX.sh -o /opt/toggle/toggle-MonitWebui.sh
+sed -i -e 's#MONITCONF#'$monitconf'#' /opt/toggle/toggle-MonitWebui.sh
+unset monitconf
 
 # custom Welcome page
 echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /usr/share/nginx/html/index.html
 
+#Add Nginx as SSL service
+echo "nginx" >> /etc/WebV2/SslServices
+
 systemctl start nginx > $OUTPUT 2>&1
 systemctl enable nginx > $OUTPUT 2>&1

CoreModules/nginx/config/nginx/site_ssl-unconfigured

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

CoreModules/nginx/config/nginx/site_ssl-wwwredir

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

CoreModules/nginx/preconf.sh

@@ -1 +1 @@
-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
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=nginx osrel=$shortdist bash > $OUTPUT 2>&1

CoreModules/nginx_nonphp/conf.sh

@@ -28,5 +28,8 @@ 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
 
+#Add Nginx as SSL service
+echo "nginx" >> /etc/WebV2/SslServices
+
 systemctl start nginx > $OUTPUT 2>&1
 systemctl enable nginx > $OUTPUT 2>&1

CoreModules/nginx_nonphp/preconf.sh

@@ -1,4 +1,4 @@
-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
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=nginx osrel=$shortdist bash > $OUTPUT 2>&1
 
 #Disable PhpMyadmin and Backend cms
 disbackendcms=1

Docs/Readme.md

@@ -1 +1 @@
-# Source files for https://git.ictmaatwerk.com/docs/Web-V2/
+# Source files for Web-V2 Documentation

Docs/docs/Dev-Adding-Modules.md

@@ -14,6 +14,8 @@ In both cases the file structure is expected as shown below
 * `<Webserver>`-apt.pkg.list
 * `<Webserver>`-dnf.pkg.list
 * config/*
+* CMSHook-preconf.sh
+* CMSHook-conf.sh
 
 ## The internal module location
 SubModules/`<ModuleName>`
@@ -32,7 +34,8 @@ SubModules/`<ModuleName>`
 | `<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 | 
-
+| CMSHook-conf.sh  | Will run as addtional preconf when CSM is installed|
+| CMSHook-conf.sh  | Will run after a CSM is installed|
 
 # Defining in the menu
 ### Add the following to ModulesMenu.list
@@ -57,4 +60,4 @@ add to the “`<WebserverName>`Options” variable after the last entry
 Make sure the the entry is quoted, otherwise the installer will break  
 ### Extra step for external modules
 For external modules the raw git url shoud be added to “extModules.list”
-Example: https://git.ictmaatwerk.com/`<user>`/`<reponame>`/raw/branch/master/
+Example: https://git.bprieshof.nl/`<user>`/`<reponame>`/raw/branch/main/

Docs/docs/User-MainInfo.md

@@ -2,36 +2,36 @@
 
 Using curl
 ```
-curl https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -o /tmp/installer.sh  
+curl https://git.bprieshof.nl/Work_Archive/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  
+wget https://git.bprieshof.nl/Work_Archive/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
 ```
-curl https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -o /tmp/installer.sh  
+curl https://git.bprieshof.nl/Work_Archive/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  
+wget https://git.bprieshof.nl/Work_Archive/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.  
 
 ```
-bash <(curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/AppendCMS.sh)
+bash <(curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work_Archive/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
 ```
-bash <(curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/AppendModule.sh)
+bash <(curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work_Archive/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/VPS-scripts/Web-V2/src/branch/master
+repo_url: https://git.bprieshof.nl/Work_Archive/VPS-scripts_Web-V2/src/branch/master
 nav:
     - User: 'User-MainInfo.md'
     - Development:

ModulesMenu.list

@@ -13,6 +13,7 @@ webservers+=("Apache:" "Will install Apache Webserver." OFF)
 nginxCMSL=("None:" "A plain webserver will be setup." OFF)
 nginxCMSL+=("Wordpress:" "WordPress is a content management system based on PHP." OFF)
 nginxCMSL+=("Nextcloud:" "Nextcloud is a suite of client-server software for creating and using file hosting services." OFF)
+nginxCMSL+=("FrontController:" "Will prepair enviroment for frontcontroller." OFF)
 #Options
 nginxOptions=("Redis:" "Redis caching" OFF)
 nginxOptions+=("Postfix:" "Mail MTA" OFF)
@@ -40,7 +41,7 @@ webservers=("Nginx" "Nginx_nonphp"  "Apache" "Quit")
 
 ##Nginx
 #CMSList
-nginxCMSL=("None" "Wordpress" "Nextcloud")
+nginxCMSL=("None" "Wordpress" "Nextcloud" "FrontController")
 #Options
 nginxOptions=("Redis:" "Postfix:")
 

PhpUpdater.sh

@@ -1,14 +1,21 @@
 #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
+if [ ! -f "/etc/WebV2/selopts.list" ] || [ ! -f "/etc/WebV2/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
 rm /tmp/pkg.list
 #Getting variables
-source /etc/ICTM/mainvar.list
+source /etc/WebV2/mainvar.list
 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
+if [ ! -f "/etc/WebV2/phpvar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GeneratePhplist.sh) ; fi
-source /etc/ICTM/phpvar.list
+source /etc/WebV2/phpvar.list
-if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ]; then
+    # Ubuntu Php variable
     apt update
-    RepoVersion=`apt list |grep php | grep deb.sury.org| cut -f1 -d"-"| tail -1 |sed 's/php//'`
+    if ! ls /var/lib/apt/lists/ppa.launchpad.net_ondrej_php*_Packages > /dev/null 2>&1 ; then echo 'PHP(Sury) repo not installed' && echo 'Install using: curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=php bash' && exit ; fi
+    RepoVersion=`grep -h '^Package: php' /var/lib/apt/lists/ppa.launchpad.net_ondrej_php*_Packages | cut -f1 -d"-" | sort | tail -1| sed -e 's/Package: php//'`
+elif [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] || [ "$shortdist" = "deb12" ]; then
+    # Debian Php variable
+    apt update
+    if ! ls /var/lib/apt/lists/packages.sury.org_php*_Packages > /dev/null 2>&1 ; then echo 'PHP(Sury) repo not installed' && echo 'Install using: curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=php bash' && exit ; fi
+    RepoVersion=`grep -h '^Package: php' /var/lib/apt/lists/packages.sury.org*_Packages| cut -f1 -d"-" | sort | tail -1| sed -e 's/Package: 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'`
@@ -22,17 +29,16 @@ msg () {
     fi
 }
 
-msg "Current php version: $phpver"
 
 if [ $IMODE = n ]; then
     # Legacy/Main Menu
     PKGD="debconf-apt-progress -- apt purge -y"
 
     #Menu
-    if (whiptail --title "Set new php version?" --yesno "Install php version $RepoVersion ?" 8 78); then
+    if (whiptail --title "Php Upgrader" --yesno "                    Current php version is $phpver, and $RepoVersion the is latest available version"  --yes-button "Yes, upgrade to this version" --no-button "No, i want to choose" 8 100); then
         newphpver=$RepoVersion
     else
-        newphpver=$(whiptail --inputbox "Please enter the version to install" --title "Custom" 8 39 3>&1 1>&2 2>&3)
+        newphpver=$(whiptail --inputbox "Please enter the version to install" --nocancel --title "Php Upgrader" 8 50 3>&1 1>&2 2>&3)
     fi
 fi
 
@@ -42,7 +48,7 @@ if [ $IMODE = l ]; then
 
     #Menu    
     while true; do
-        read -p "Set phpversion to version $RepoVersion ? -> yes/no?" yn
+        read -p "Current php version is $phpver, and $RepoVersion the is latest available version -> Yes, upgrade to this version/No, i want to choose? " yn
         case $yn in
             [Yy]* ) newphpver=$RepoVersion
             break;;
@@ -55,7 +61,7 @@ if [ $IMODE = l ]; then
  fi   
 
     #Genereating vars for new php version
-    if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+    if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] || [ "$shortdist" = "deb12" ] ; then
     # Debian/Ubunbtu Php variables
         newphpPoolDir=/etc/php/${newphpver}/fpm/pool.d
         newphpPkgName=php${newphpver}
@@ -87,11 +93,12 @@ if [ $IMODE = l ]; then
 
 if [ $IMODE = n ]; then
     #Purge
-    if (whiptail --title "Set new php version?" --yesno "Remove php $phpver ?" 8 78); then
+    if (whiptail --title "Php Upgrader" --yesno "Remove old php version ($phpver) ?" 8 78); then
        PhpPurge=1
        $PKGP -y $phpPkgName*
     else
        PhpPurge=0
+       echo "$PKGP -y $phpPkgName*" > ~/remove-PHP-$phpver 
     fi
 fi
 
@@ -99,7 +106,7 @@ fi
 if [ $IMODE = l ]; then    
     #Purge
     while true; do
-        read -p "Remove php $phpver ? -> yes/no?" yn
+        read -p "Remove old php version ($phpver) ? -> yes/no?" yn
         case $yn in
             [Yy]* ) PhpPurge=1 ; $PKGP $phpPkgName*
             break;;
@@ -119,13 +126,13 @@ systemctl start $newphpFPMService
 systemctl enable $newphpFPMService
 
 
-sed -i "/phpver/c\phpver=\"$newphpver\"" /etc/ICTM/mainvar.list
+sed -i "/phpver/c\phpver=\"$newphpver\"" /etc/WebV2/mainvar.list
 
-mv /etc/ICTM/phpvar.list /etc/ICTM/phpvar"$phpver".list
+mv /etc/WebV2/phpvar.list /etc/WebV2/phpvar"$phpver".list
 for storeme in newphpPoolDir newphpPkgName newphpMainConf newphpFPMService; do
-    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/phpvar.list
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/WebV2/phpvar.list
 done
-sed -i 's/new//' /etc/ICTM/phpvar.list
+sed -i 's/new//' /etc/WebV2/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)

README.md

@@ -3,36 +3,36 @@
 **Default/Graphical installer**:  
 Using curl
 ```
-curl https://git.ictmaatwerk.com/VPS-scripts/Web-V2/raw/branch/master/installer.sh -o /tmp/installer.sh  
+curl https://git.bprieshof.nl/Work_Archive/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  
+wget https://git.bprieshof.nl/Work_Archive/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  
+curl https://git.bprieshof.nl/Work_Archive/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  
+wget https://git.bprieshof.nl/Work_Archive/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)
+bash <(curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work_Archive/VPS-scripts_Web-V2/raw/branch/master/AppendCMS.sh)
 ```
 
 ## 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)
+bash <(curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work_Archive/VPS-scripts_Web-V2/raw/branch/master/AppendModule.sh)
 ```
 
 ### This script uses the following repo's as dependencies:
@@ -41,5 +41,4 @@ bash <(curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts
 * VPS-scripts/Ubuntu-MySQL
 ```  
 
------
+-----
-### Further documentation can be found at https://git.ictmaatwerk.com/docs/Web-V2/

Scripts/Compat/Compat-V2.sh

@@ -0,0 +1,23 @@
+if [ ! -f "/etc/WebV2/selopts.list" ] || [ ! -f "/etc/WebV2/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
+
+#Getting information and vars
+source /etc/WebV2/mainvar.list
+
+#CompatUpdater Setup
+UpdaterCompatTo=2
+if  [ -z ${CompatVer} ]; then CompatVer=1 ; fi
+if  [ "$CompatVer" -ge "$UpdaterCompatTo" ]; then echo "Web-V2 is update to-date,Update scipt version= $UpdaterCompatTo, Current version= $CompatVer" && exit ; fi
+
+printf '%s' "Updating Web-V2..."
+#NewCompat var
+CompatVer=$UpdaterCompatTo
+
+#Updating mod lists
+aonoption="/MySQL/"
+aonoption="$aonoption /Unattended-Security-Updates/"
+aonoption="$aonoption /Backup-Util/"
+aonoption="$aonoption /AcmeSH/"
+echo 'EnabledAons=('$aonoption')' >> /etc/WebV2/selopts.list
+declare -p CompatVer | cut -d ' ' -f 3- >> /etc/WebV2/mainvar.list
+
+printf " [\033[0;32mok\033[0m]\n"

Scripts/EnableSSL.sh

@@ -1,5 +1,5 @@
 #loading install vars
-source /etc/ICTM/mainvar.list
+source /etc/WebV2/mainvar.list
 #Setting Vars
 sitename=CONFname
 domain=DOMAINname
@@ -9,7 +9,7 @@ webservice=WebServer
 
 #Correcting service name for Apache
 if [ $webservice = apache ]; then\
-    source /etc/ICTM/apachevar.list
+    source /etc/WebV2/apachevar.list
     webservice="$apacheService"
     ext=.conf
 fi
@@ -37,6 +37,8 @@ fi
 if test $certsatus -eq 0
 then
 	site_ext="ssl"
+    mkdir -p /etc/acmesh/inst/$domain
+    /opt/acmesh/acme.sh  --config-home '/etc/acmesh/data' --install-cert --ecc --domain $domain --cert-file /etc/acmesh/inst/$domain/cert.pem --key-file /etc/acmesh/inst/$domain/key.pem --ca-file /etc/acmesh/inst/$domain/ca.cer --fullchain-file /etc/acmesh/inst/$domain/fullchain.pem --reloadcmd 'systemctl reload $(cat /etc/WebV2/SslServices)'
 else
 	site_ext="nossl"
     rm -rf /etc/acmesh/certs/$domain*

Scripts/GenerateApacheList.sh

@@ -1,8 +1,8 @@
-if [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
+if [ ! -f "/etc/WebV2/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
-source /etc/ICTM/mainvar.list
+source /etc/WebV2/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
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
 # Debian/Ubunbtu apache variables
     apacheConfDir=/etc/apache2
     apacheService=apache2
@@ -15,5 +15,5 @@ fi
 
 #Storing vars to config
 for storeme in apacheService apacheConfDir; do
-    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/apachevar.list
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/WebV2/apachevar.list
 done

Scripts/GeneratePhplist.sh

@@ -1,8 +1,8 @@
-if [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
+if [ ! -f "/etc/WebV2/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
-source /etc/ICTM/mainvar.list
+source /etc/WebV2/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
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ]  ; then
 # Debian/Ubunbtu Php variables
     phpPoolDir=/etc/php/${phpver}/fpm/pool.d
     phpPkgName=php${phpver}
@@ -19,5 +19,5 @@ fi
 
 #Storing vars to config
 for storeme in phpPoolDir phpPkgName phpMainConf phpFPMService; do
-    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/phpvar.list
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/WebV2/phpvar.list
 done

Scripts/MicroOSDetect.sh

@@ -7,6 +7,8 @@ if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then
     shortdist=ubu2004 
 elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
     shortdist=deb10
+elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"11"* ]]; then
+    shortdist=deb11    
 elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
     shortdist=el8
 else

Scripts/Php-EnableSessionsToRam.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+#######################################################
+# @description:                                       #
+#   Setup the PHP session folder as a Ramdisk / tmpfs #
+#   This will store session info in memory            #
+#                                                     #
+# @author: Bram Prieshof                              #
+#######################################################
+
+#sysCheck
+if [ ! -f "/etc/WebV2/selopts.list" ] || [ ! -f "/etc/WebV2/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
+if [ ! -f "/etc/WebV2/phpvar.list" ] ; then bash <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/GeneratePhplist.sh) ; fi
+source /etc/WebV2/phpvar.list
+
+#Stop php service
+systemctl stop $phpFPMService
+#Reset php session folder
+rm -rf /var/lib/php/sessions
+mkdir -p /var/lib/php/sessions
+#Create memdisk/Tmpfs and mount it
+echo "tmpfs /var/lib/php/sessions tmpfs size=32m,uid=$(id -u www-data),gid=$(id -g www-data),mode=0773 0 0" >> /etc/fstab
+mount -a
+#start php service
+systemctl stop $phpFPMService

Scripts/SMI.sh

@@ -45,14 +45,18 @@ elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
  PKGI="${PKGM} install -y --no-install-recommends"
  PKGLIST="apt"
  shortdist=deb10
+elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"11"* ]]; then
+ echo "Debian 11 Detected"
+ PKGM="$APTMODE"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=deb11 
 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
@@ -62,8 +66,8 @@ unset dist_ver dist APTMODE
 
 
 #Repo Vars
-repo=https://git.ictmaatwerk.com/VPS-scripts/Web-V2
+repo=https://git.bprieshof.nl/Work_Archive/VPS-scripts_Web-V2
-branch=master
+branch=main
 branchtype=branch
 
 ###Select Module type
@@ -133,7 +137,7 @@ fi
 ##--------------------## 
 
 msg "                Preconfiguring"
-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
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
 $PKGUC
 $PKGUP
 

Scripts/toggles/toggle-Monit_APACHE.sh

@@ -0,0 +1,39 @@
+function usage {
+    echo "Usage: $0 [option...]" >&2
+    echo
+    echo "   -e,    Enable MonitWebui"
+    echo "   -d,    Disable MonitWebui"
+    echo "   -h,    Shows this information"
+    echo
+}
+if [ -n "$1" ]; then
+    if [[ ! -f /etc/WebV2/toggle.conf ]]; then
+        echo "Creating File"
+        touch /etc/WebV2/toggle.conf
+    fi
+    source /etc/WebV2/toggle.conf
+    if [ -z "$MonitWeb" ]; then
+        echo "Creating Var"
+        echo "MonitWeb=3" >> /etc/WebV2/toggle.conf
+        MonitWeb=3
+    fi
+    if [[ "$1" = "-d" && "$MonitWeb" != 0 ]]; then
+        echo "Disable MonitWebui"
+        sed -i '/MonitWeb=/c\MonitWeb=0' /etc/WebV2/toggle.conf
+        sed -i --follow-symlinks '/#enables\/disables monit-websocket/!b;n;cdeny from all' /APADIR/sites-enabled/010-Backend.conf
+        sed -i '/#enables\/disables monit-websocket/ s/^#*/#/' MONITCONF
+        systemctl reload APASRV monit
+    elif [[ "$1" = "-e" && "$MonitWeb" !=  1 ]]; then
+        echo "Enable MonitWebui"
+        sed -i '/MonitWeb=/c\MonitWeb=1' /etc/WebV2/toggle.conf
+        sed -i --follow-symlinks '/#enables\/disables monit-websocket/!b;n;c#deny from all' /APADIR/sites-enabled/010-Backend.conf
+        sed -i '/#enables\/disables monit-websocket/ s/^.//' MONITCONF
+        systemctl reload APASRV monit
+    elif [[ "$1" = "-h" ]]; then
+        usage
+    else
+        echo "Oopsie!"
+    fi
+else
+ usage
+fi

Scripts/toggles/toggle-Monit_NGINX.sh

@@ -0,0 +1,39 @@
+function usage {
+    echo "Usage: $0 [option...]" >&2
+    echo
+    echo "   -e,    Enable MonitWebui"
+    echo "   -d,    Disable MonitWebui"
+    echo "   -h,    Shows this information"
+    echo
+}
+if [ -n "$1" ]; then
+    if [[ ! -f /etc/WebV2/toggle.conf ]]; then
+        echo "Creating File"
+        touch /etc/WebV2/toggle.conf
+    fi
+    source /etc/WebV2/toggle.conf
+    if [ -z "$MonitWeb" ]; then
+        echo "Creating Var"
+        echo "MonitWeb=3" >> /etc/WebV2/toggle.conf
+        MonitWeb=3
+    fi
+    if [[ "$1" = "-d" && "$MonitWeb" != 0 ]]; then
+        echo "Disable MonitWebui"
+        sed -i '/MonitWeb=/c\MonitWeb=0' /etc/WebV2/toggle.conf
+        sed -i --follow-symlinks '/deny all; #enables\/disables monit-websocket/c\        deny all; #enables\/disables monit-websocket' /etc/nginx/sites-enabled/Backend
+        sed -i '/#enables\/disables monit-websocket/ s/^#*/#/' MONITCONF
+        systemctl reload nginx monit
+    elif [[ "$1" = "-e" && "$MonitWeb" !=  1 ]]; then
+        echo "Enable MonitWebui"
+        sed -i '/MonitWeb=/c\MonitWeb=1' /etc/WebV2/toggle.conf
+        sed -i --follow-symlinks '/deny all; #enables\/disables monit-websocket/c\        #deny all; #enables\/disables monit-websocket' /etc/nginx/sites-enabled/Backend
+        sed -i '/#enables\/disables monit-websocket/ s/^.//' MONITCONF
+        systemctl reload nginx monit
+    elif [[ "$1" = "-h" ]]; then
+        usage
+    else
+        echo "Oopsie!"
+    fi
+else
+ usage
+fi

Scripts/toggles/toggle-Netdata_NGINX.sh

@@ -7,26 +7,26 @@ function usage {
     echo
 }
 if [ -n "$1" ]; then
-    if [[ ! -f /etc/ICTM/toggle.conf ]]; then
+    if [[ ! -f /etc/WebV2/toggle.conf ]]; then
         echo "Creating File"
-        touch /etc/ICTM/toggle.conf
+        touch /etc/WebV2/toggle.conf
     fi
-    source /etc/ICTM/toggle.conf
+    source /etc/WebV2/toggle.conf
     if [ -z "$NetDa" ]; then
         echo "Creating Var"
-        echo "NetDa=3" >> /etc/ICTM/toggle.conf
+        echo "NetDa=3" >> /etc/WebV2/toggle.conf
         NetDa=3
     fi
     if [[ "$1" = "-d" && "$NetDa" != 0 ]]; then
         echo "Disable Netdata"
-        sed -i '/NetDa=/c\NetDa=0' /etc/ICTM/toggle.conf
+        sed -i '/NetDa=/c\NetDa=0' /etc/WebV2/toggle.conf
         sed -i --follow-symlinks '/deny all; #enables\/disables Netdata/c\        deny all; #enables\/disables Netdata' /etc/nginx/sites-enabled/Backend
         systemctl stop netdata
         systemctl disable netdata > /dev/null 2>&1
         systemctl reload nginx
     elif [[ "$1" = "-e" && "$NetDa" !=  1 ]]; then
         echo "Enable Netdata"
-        sed -i '/NetDa=/c\NetDa=1' /etc/ICTM/toggle.conf
+        sed -i '/NetDa=/c\NetDa=1' /etc/WebV2/toggle.conf
         sed -i --follow-symlinks '/deny all; #enables\/disables Netdata/c\        #deny all; #enables\/disables Netdata' /etc/nginx/sites-enabled/Backend
         systemctl start netdata
         systemctl enable netdata > /dev/null 2>&1

Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh

@@ -7,24 +7,24 @@ function usage {
     echo
 }
 if [ -n "$1" ]; then
-    if [[ ! -f /etc/ICTM/toggle.conf ]]; then
+    if [[ ! -f /etc/WebV2/toggle.conf ]]; then
         echo "Creating File"
-        touch /etc/ICTM/toggle.conf
+        touch /etc/WebV2/toggle.conf
     fi
-    source /etc/ICTM/toggle.conf
+    source /etc/WebV2/toggle.conf
     if [ -z "$PhpMA" ]; then
         echo "Creating Var"
-        echo "PhpMA=3" >> /etc/ICTM/toggle.conf
+        echo "PhpMA=3" >> /etc/WebV2/toggle.conf
         PhpMA=3
     fi
     if [[ "$1" = "-d" && "$PhpMA" != 0 ]]; then
         echo "Disable PhpMyadmin"
-        sed -i '/PhpMA=/c\PhpMA=0' /etc/ICTM/toggle.conf
+        sed -i '/PhpMA=/c\PhpMA=0' /etc/WebV2/toggle.conf
         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 '/PhpMA=/c\PhpMA=1' /etc/WebV2/toggle.conf
         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

Scripts/toggles/toggle-PhpMyAdmin_NGINX.sh

@@ -7,24 +7,24 @@ function usage {
     echo
 }
 if [ -n "$1" ]; then
-    if [[ ! -f /etc/ICTM/toggle.conf ]]; then
+    if [[ ! -f /etc/WebV2/toggle.conf ]]; then
         echo "Creating File"
-        touch /etc/ICTM/toggle.conf
+        touch /etc/WebV2/toggle.conf
     fi
-    source /etc/ICTM/toggle.conf
+    source /etc/WebV2/toggle.conf
     if [ -z "$PhpMA" ]; then
         echo "Creating Var"
-        echo "PhpMA=3" >> /etc/ICTM/toggle.conf
+        echo "PhpMA=3" >> /etc/WebV2/toggle.conf
         PhpMA=3
     fi
     if [[ "$1" = "-d" && "$PhpMA" != 0 ]]; then
         echo "Disable PhpMyadmin"
-        sed -i '/PhpMA=/c\PhpMA=0' /etc/ICTM/toggle.conf
+        sed -i '/PhpMA=/c\PhpMA=0' /etc/WebV2/toggle.conf
         sed -i --follow-symlinks '/deny all; #enables\/disables PHPMyadmin/c\        deny all; #enables\/disables PHPMyadmin' /etc/nginx/sites-enabled/Backend
         systemctl reload nginx
     elif [[ "$1" = "-e" && "$PhpMA" !=  1 ]]; then
         echo "Enable PhpMyadmin"
-        sed -i '/PhpMA=/c\PhpMA=1' /etc/ICTM/toggle.conf
+        sed -i '/PhpMA=/c\PhpMA=1' /etc/WebV2/toggle.conf
         sed -i --follow-symlinks '/deny all; #enables\/disables PHPMyadmin/c\        #deny all; #enables\/disables PHPMyadmin' /etc/nginx/sites-enabled/Backend
         systemctl reload nginx
     elif [[ "$1" = "-h" ]]; then

SubModules/php-fpm/conf.sh

@@ -15,6 +15,10 @@ 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"
 
 
+#Php session to disk
+chown www-data:www-data /var/lib/php/sessions
+chmod 1773 /var/lib/php/sessions
+
 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

SubModules/php-fpm/php-ModInst.sh

@@ -0,0 +1,176 @@
+#############################
+#   SingleModuleInstaller   #
+#        For PHP-FPM        #
+#############################
+
+
+##-----------------##
+#   Defining Vars   #
+##-----------------##
+
+#SMI specific Vars
+SMI_config=yes
+SMI_ModuleName=php-fpm
+
+#Enforcing Legacy Mode
+APTMODE="apt"
+OUTPUT='/dev/tty'
+IMODE=l
+
+#Web-V2 Vars
+phpver=8.1
+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"
+ PKGUC="$PKGM update"
+ PKGUP="$PKGM upgrade -y"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=ubu1804
+elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then
+ PKGM="$APTMODE"
+ PKGUC="$PKGM update"
+ PKGUP="$PKGM upgrade -y"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=ubu2004
+elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
+ PKGM="$APTMODE"
+ PKGUC="$PKGM update"
+ PKGUP="$PKGM upgrade -y"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=deb10
+elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"11"* ]]; then
+ PKGM="$APTMODE"
+ PKGUC="$PKGM update"
+ PKGUP="$PKGM upgrade -y"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=deb11
+ elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"12"* ]]; then
+ PKGM="$APTMODE"
+ PKGUC="$PKGM update"
+ PKGUP="$PKGM upgrade -y"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=deb12
+elif [ "$(grep -oP '(?<=^PLATFORM_ID=).+' /etc/os-release | tr -d '"')" = "platform:el8" ]; then
+ PKGM="dnf"
+ PKGUC="$PKGM check-update --refresh"
+ PKGUP="$PKGM update -y"
+ PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y"
+ PKGLIST="dnf"
+ shortdist=el8
+else
+ echo "This os in not supported"
+ exit
+fi
+
+unset dist_ver dist APTMODE
+
+
+#Repo Vars
+repo=https://git.bprieshof.nl/Work_Archive/VPS-scripts_Web-V2
+branch=main
+branchtype=branch
+
+###Select Module type
+mtype=""$repo"/raw/"$branchtype"/"$branch"/SubModules/"$SMI_ModuleName""
+
+#SelfBuilding Vars
+PKGI="${PKGM} install -y"
+
+
+##---------------##
+#    Functions    #
+##---------------##
+
+msg () {
+echo "$1"
+}
+
+#Checking if Config var has been set
+if [ $SMI_config = no ]; then
+msg "        Script is not configured"
+exit
+fi
+
+
+##-----------------##
+#   Storeing vars   #
+##-----------------##
+
+mkdir -p /etc/WebV2
+echo "InstDate=$(date "+%d-%B-%Y")" >> /etc/WebV2/mainvar.list
+
+for storeme in PKGM PKGI PKGUC PKGUP PKGLIST OUTPUT IMODE shortdist repo branch branchtype shortdist phpver webserv; do
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/WebV2/mainvar.list
+done
+
+echo 'EnabledAons=('$SMI_ModuleName')' >> /etc/WebV2/selopts.list
+
+##--------------------------##
+#   Installer-Requirements   #
+##--------------------------##
+
+msg "              Starting installer" 8 78
+$PKGUC > $OUTPUT 2>&1
+$PKGI curl > $OUTPUT 2>&1
+
+
+##-------------------------##
+#    Generating APT list    #
+##-------------------------##
+#Remove existing pkgList
+rm -f /tmp/pkg.list
+
+##--------------------##
+#   Pre-Requirements   #
+##--------------------## 
+
+msg "                Preconfiguring"
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
+$PKGUC
+$PKGUP
+
+
+##-------------------##
+#   Pre-configuring   #
+##-------------------##
+
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/preconf.sh; then
+ source <(curl --retry 7 --retry-delay 5 -s "$mtype"/preconf.sh)
+fi
+
+echo less >> /tmp/pkg.list
+printf " " >>/tmp/pkg.list
+
+##-------------##
+#   Installer   #
+##-------------##
+
+$PKGUC
+sed -i 's/PHPprefix/'$phpPkgName'/g' /tmp/pkg.list
+cat /tmp/pkg.list | xargs $PKGI
+
+
+##---------------##
+#   Configuring   #
+##---------------##
+
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/conf.sh; then
+ source <(curl --retry 7 --retry-delay 5 -s "$mtype"/conf.sh)
+fi
+
+##-------##
+#   end   #
+##-------##
+
+msg "                         Done!"

SubModules/php-fpm/preconf.sh

@@ -1,4 +1,7 @@
-if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+#Setting up repository
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=php osrel=$shortdist bash > $OUTPUT 2>&1
+
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] || [ "$shortdist" = "deb12" ] ; then
 # Debian/Ubunbtu Php variables
     phpPoolDir=/etc/php/${phpver}/fpm/pool.d
     phpPkgName=php${phpver}
@@ -12,7 +15,7 @@ elif [ "$shortdist" = "el8" ]; then
     phpMainConf=/etc/opt/remi/php${phpver//.}/php.ini
     phpFPMService=php${phpver//.}-php-fpm
 #Creating Socket directory
-    mkdir -p /var/run/php
+    mkdir -p /var/run/php /var/lib/php/sessions
 fi
 
 #Setting php version branch 
@@ -35,5 +38,5 @@ 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
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/WebV2/phpvar.list
 done

SubModules/postfix/CMSHook-conf.sh

@@ -0,0 +1,24 @@
+#ADD DOMAIN
+sudo --user opendkim mkdir /etc/opendkim.d/keys/"$maildomain"
+sudo --user opendkim opendkim-genkey -r -D /etc/opendkim.d/keys/"$maildomain" -d "$maildomain" -s "$odkdomsec"
+echo "$maildomain" >> /etc/opendkim.d/TrustedHosts
+echo "$odkdomsec._domainkey."$maildomain" "$maildomain":"$odkdomsec":/etc/opendkim.d/keys/"$maildomain"/"$odkdomsec".private" >> /etc/opendkim.d/KeyTable
+
+if [ $webserv != nginx_nonphp ]; then
+    echo "" >> "$phpPoolDir"/"$sitename".conf
+    echo "php_admin_value[mail.force_extra_parameters] = \"-f$mailas -F'$maildomain'\"" >> "$phpPoolDir"/"$sitename".conf
+fi
+
+
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/opendkim-init.sh -o ~/OpenDKIMInit-$sitename.sh
+sed -i -e 's/DOMAINname/'$maildomain'/g' -e 's/SITEName/'${sitename//_}'/g' -e 's/ODKSec/'$odkdomsec'/g' ~/OpenDKIMInit-$sitename.sh
+
+cat << EOF > /etc/update-motd.d/51-opendkim-"${sitename//_}"
+#!/bin/sh
+red='\e[1;31m%s\e[0m\n'
+printf "\n"
+printf \$red "To enable mail for $domain please run please run bash ~/OpenDKIMInit-$sitename.sh"
+printf "\n"
+EOF
+chmod +x /etc/update-motd.d/51-opendkim-"${sitename//_}"
+systemctl reload opendkim $phpFPMService

SubModules/postfix/CMSHook-preconf.sh

@@ -0,0 +1,46 @@
+if [ -z "${sitename}" ]; then sitename=${domain//./_};fi
+if [ $IMODE = n ]; then
+    if (whiptail --title "Config" --yesno "                Send mail as info@$domain for $domain?" 11 78); then
+        mailas=info@$domain
+        maildomain=$domain
+    else
+        mailas=$(whiptail --nocancel --inputbox "                   Enter mail addres for sending mail?" 11 78 --title "Config" 3>&1 1>&2 2>&3)
+        maildomain=$(sed -e 's/[^@]*@//' <<< "$mail")
+    fi
+    if (whiptail --title "Config" --yesno "                     Use default DKIM selector [vps]?" 11 78); then
+        odkdomsec=vps
+    else
+        odkdomsec=$(whiptail --nocancel --inputbox "                           Enter DKIM selector" 11 78 --title "Config" 3>&1 1>&2 2>&3)
+    fi
+fi
+
+if [ $IMODE = l ]; then
+    while true; do
+        read -p "Send mail as info@$domain for $domain? (y/n)" yn
+        case $yn in
+            [Yy]* )
+                mailas=info@$domain
+                maildomain=$domain
+            break;;            
+            [Nn]* )
+                echo 'Enter mail addres for sending mail? '
+                read mailas
+                maildomain=$(sed -e 's/[^@]*@//' <<< "$mailas")
+            break;;
+            * )echo "Choose yes or no.";;
+        esac
+    done
+    while true; do
+        read -p "Use default DKIM selector [vps]? (y/n)" yn
+        case $yn in
+            [Yy]* )
+                odkdomsec=vps
+            break;;            
+            [Nn]* )
+                echo 'Enter DKIM selector? '
+                read odkdomsec
+            break;;
+            * )echo "Choose yes or no.";;
+        esac
+    done
+fi

SubModules/postfix/Postfix-EnableSSL.sh

@@ -0,0 +1,32 @@
+#Sript for setting up SSL/TLS for Postfix (Web-V2)
+
+##Loading install vars
+source /etc/WebV2/mainvar.list
+##Checking if hostname cert exists
+if [ ! -f "/etc/acmesh/inst/$hostname/cert.pem" ] || [ ! -f "/etc/acmesh/inst/$hostname/key.pem" ] ; then echo 'SSL Certificate for $hostname is not installed' && exit ; fi
+
+##Updating Postix config
+printf "Updating Postfix config"
+systemctl stop postfix
+sed -i "/smtpd_tls_cert_file=/c\ssmtpd_tls_cert_file=/etc/acmesh/inst/$hostname/cert.pem" /etc/postfix/main.cf
+sed -i "/smtpd_tls_key_file=/c\smtpd_tls_key_file=/etc/acmesh/inst/$hostname/key.pem" /etc/postfix/main.cf
+systemctl start postfix
+printf " [\e[1;32m Ok \e[0m]\n"
+
+##Adding postfix to SSL services (so it gets reloaded when a the cert is renewd)
+printf "Updating SSL services list"
+echo "postfix" >> /etc/WebV2/SslServices
+printf " [\e[1;32m Ok \e[0m]\n"
+
+##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

SubModules/postfix/apt.pkg.list

@@ -1 +1 @@
-mailutils
+mailutils opendkim-tools

SubModules/postfix/conf.sh

@@ -1,11 +1,20 @@
+
+systemctl stop postfix opendkim
+
+
 ##-------------##
 #    Postfix    #
 ##-------------##
 
-sed -i 's/#inet_interfaces = all/inet_interfaces = loopback-only/g' /etc/postfix/main.cf
+sed -i "/^inet_interfaces =/c\inet_interfaces = loopback-only" /etc/postfix/main.cf
-sed -i 's/mydestination/#mydestination/g' /etc/postfix/main.cf
+sed -i "/recipient_delimiter =/c\recipient_delimiter = +" /etc/postfix/main.cf
-sed -i 's/relayhost =/mydestination = '$hostname', localhost.'$hostname', '$hostname'/g' /etc/postfix/main.cf
+sed -i "/^mydestination =/c\mydestination = \"$hostname\", localhost.\"$hostname\", \"$hostname\"" /etc/postfix/main.cf
-echo "bounce_notice_recipient = info@$domain" >> /etc/postfix/main.cf
+echo "$hostname" > /etc/mailname
+if [ "$(echo "$hostname" | grep -o "\." | wc -l)" -eq 1 ]; then
+  echo "bounce_notice_recipient = admin@$hostname" >> /etc/postfix/main.cf
+else
+ echo "bounce_notice_recipient = admin@$(sed 's/.*\.\(.*\..*\)/\1/' <<< $hostname)" >> /etc/postfix/main.cf
+fi
 cat <<EOF > /etc/aliases
 # See man 5 aliases for format
 postmaster:    root
@@ -13,6 +22,83 @@ root:          $email
 EOF
 newaliases
 
-systemctl start postfix 
+cat <<EOF >> /etc/postfix/main.cf
-systemctl enable postfix
+
-systemctl reload postfix
+#openDKIM
+milter_default_action = accept
+milter_protocol = 2
+smtpd_milters = unix:/var/run/opendkim/opendkim.sock
+non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock
+EOF
+
+
+##--------------##
+#    OpenDKIM    #
+##--------------##
+
+usermod -aG opendkim postfix
+rm -rf /etc/opendkim.d
+mkdir -p /etc/opendkim.d/keys
+chown opendkim:opendkim /etc/opendkim.d/keys -R
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim.conf
+touch /etc/opendkim.d/SigningTable
+cat <<EOF > /etc/opendkim.d/TrustedHosts
+127.0.0.1
+::1
+localhost
+$(curl -s -4 icanhazip.com)
+$(curl -s -6 icanhazip.com)
+${hostname}
+EOF
+
+
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
+    mkdir -p /var/spool/postfix/var/run/opendkim
+    sudo chown opendkim:postfix /var/spool/postfix/var/run/opendkim
+    sed -i "/^RUNDIR=/c\RUNDIR=/var/spool/postfix/var/run/opendkim" /etc/default/opendkim
+    echo "TrustAnchorFile       /usr/share/dns/root.key" >> /etc/opendkim.conf
+    bash /lib/opendkim/opendkim.service.generate
+    systemctl daemon-reload
+fi
+
+odkhsec=$(sed 's/\..*$//'  <<< $hostname)
+sudo --user opendkim mkdir /etc/opendkim.d/keys/"$hostname"
+sudo --user opendkim opendkim-genkey -r -D /etc/opendkim.d/keys/"$hostname" -d "$hostname" -s $odkhsec
+echo ""$odkhsec"._domainkey."$hostname" "$hostname":"$odkhsec":/etc/opendkim.d/keys/"$hostname"/"$odkhsec".private" >> /etc/opendkim.d/KeyTable
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/opendkim-init.sh -o ~/OpenDKIMInit-host.sh
+sed -i -e 's/DOMAINname/'$hostname'/g' -e 's/SITEName/'host'/g' -e 's/ODKSec/'$odkhsec'/g' ~/OpenDKIMInit-host.sh
+unset odkhsec
+
+
+cat << EOF > /etc/update-motd.d/51-generalspf
+#!/bin/sh
+red='\e[1;31m%s\e[0m\n'
+printf "\n"
+printf \$red "To enable mail for this server add the folling Records for $hostname:"
+printf \$red "A record: \$(curl -s -4 icanhazip.com)"
+printf \$red "AAA record: \$(curl -s -6 icanhazip.com)"
+printf \$red "MX record: '0 mail'"
+printf \$red "SPF record: '\"v=spf1 a mx -all\"'"
+printf \$red "Check Blacklist using the following url: 'https://www.debouncer.com/blacklistlookup?t=$hostname'"
+printf "\n"
+printf \$red "Optionally, to enable DKIM for the hostname run bash ~/OpenDKIMInit-host.sh"
+printf \$red "Remove notice this by running \"rm /etc/update-motd.d/51-generalspf\""
+printf "\n"
+EOF
+chmod +x /etc/update-motd.d/51-generalspf
+
+systemctl start postfix opendkim 
+systemctl enable postfix opendkim
+
+#Getting script for enableling ssl on Postfix
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/Postfix-EnableSSL.sh -o ~/Postfix-EnableSSL.sh
+
+#if using Append module run for existing cms/sites
+if [  "$itype" = "AddMod" ]; then
+   for file in /etc/WebV2/sites/*; do
+        sitename="${file##*/}"
+        domain=${sitename//_/.}
+        source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/CMSHook-preconf.sh)
+        source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/CMSHook-conf.sh)
+    done
+fi

SubModules/postfix/config/opendkim.conf

@@ -0,0 +1,12 @@
+Syslog               yes
+UMask                007
+Socket               local:/var/run/opendkim/opendkim.sock
+PidFile              /var/run/opendkim/opendkim.pid
+OversignHeaders      From
+UserID               opendkim
+Canonicalization     relaxed/simple
+Mode                 s
+KeyTable             refile:/etc/opendkim.d/KeyTable
+SigningTable         refile:/etc/opendkim.d/SigningTable
+ExternalIgnoreList   refile:/etc/opendkim.d/TrustedHosts
+InternalHosts        refile:/etc/opendkim.d/TrustedHosts

SubModules/postfix/dnf.pkg.list

@@ -0,0 +1 @@
+perl-Getopt-Long

SubModules/postfix/generic.pkg.list

@@ -1 +1 @@
-postfix
+postfix opendkim

SubModules/postfix/opendkim-init.sh

@@ -0,0 +1,39 @@
+if [ -n "$1" ]; then
+    if [[ "$1" = "--enable" ]]; then
+        echo "Enableing DKIM"
+
+        echo "*@DOMAINname ODKSec._domainkey.DOMAINname" >>/etc/opendkim.d/SigningTable
+        systemctl reload opendkim
+        #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
+        exit
+    fi
+fi
+echo "Required to enable mailing for this system"
+echo "Please make sure a valid MX record, and A/AAA are set for DOMAINname,"
+echo "Please add the folloing to your SPF Record in the DNS of DOMAINname,"
+echo "ip4:$(curl -s -4 icanhazip.com) ip6:$(curl -s -6 icanhazip.com)"
+echo ""
+echo "Alternatively use the 'a' and 'mx' in the SPF record just make sure the server has an 'A' and 'AAA' record pointing to it"
+echo ""
+echo ""
+echo "Optionally to enable dkim" 
+echo "Add the folloing TXT Record to the DNS of DOMAINname"
+echo "WARNING the output is split, please combine key before inserting into DNS" 
+cat /etc/opendkim.d/keys/DOMAINname/ODKSec.txt
+
+echo ""
+echo "If DNS is propegated then run \"bash $0 --enable\""
+
+rm -f /etc/update-motd.d/51-opendkim-SITEName
+

SubModules/postfix/preconf.sh

@@ -1,13 +1,4 @@
-if [ -z "${domain}" ]; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
-    if [ $IMODE = n ]; then
+    debconf-set-selections <<< "postfix postfix/mailname string $hostname"
-        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/preconf.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
 # Debian/Ubunbtu redis variables
     redisService=redis-server
 
@@ -10,4 +10,4 @@ elif [ "$shortdist" = "el8" ]; then
 fi
 
 
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=redis osrel=$shortdist bash > $OUTPUT 2>&1
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=redis osrel=$shortdist bash > $OUTPUT 2>&1

extModules.list

@@ -1,4 +1,4 @@
-https://git.ictmaatwerk.com/VPS-scripts/MySQL/raw/branch/master/
+https://git.bprieshof.nl/Work_Archive/VPS-scripts_MySQL/raw/branch/main/
-https://git.ictmaatwerk.com/VPS-scripts/Unattended-Security-Updates/raw/branch/master/
+https://git.bprieshof.nl/Work_Archive/VPS-scripts_Unattended-Security-Updates/raw/branch/main/
-https://git.ictmaatwerk.com/VPS-scripts/Backup-Util/raw/branch/master/
+https://git.bprieshof.nl/Work_Archive/VPS-scripts_Backup-Util/raw/branch/master/
-https://git.ictmaatwerk.com/VPS-scripts/AcmeSH/raw/branch/main/
+https://git.bprieshof.nl/Work_Archive/VPS-scripts_AcmeSH/raw/branch/main/

installer.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+###############################
+# @author: Bram Prieshof      #
+# @author: Branco van de Waal #
+###############################
+
+itype=Main
 
 ##--------------------##
 #   Legacy/Main Menu   #
@@ -23,13 +29,15 @@ fi
 ##---------------##
 
 #Git-repo
-repo=https://git.ictmaatwerk.com/VPS-scripts/Web-V2
+repo=https://git.bprieshof.nl/Work_Archive/VPS-scripts_Web-V2
-branch=master
+branch=main
 branchtype=branch #=branch for branch and =tag for release
+CompatVer=2
 #Installer-config
-phpver=7.4
+phpver=8.1
 PHPMyadmin=1 #Overwriten by cms's without php
 sqlver=8.0
+SiteCount=1
 TestMode=0
 #PackageManager-config
 
@@ -57,14 +65,20 @@ elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
  PKGI="${PKGM} install -y --no-install-recommends"
  PKGLIST="apt"
  shortdist=deb10
-elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
+elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"11"* ]]; then
+ PKGM="$APTMODE"
+ PKGUC="$PKGM update"
+ PKGUP="$PKGM upgrade -y"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=deb11
+elif [ "$(grep -oP '(?<=^PLATFORM_ID=).+' /etc/os-release | tr -d '"')" = "platform:el8" ]; then
  PKGM="dnf"
  PKGUC="$PKGM check-update --refresh"
  PKGUP="$PKGM update -y"
  PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y"
  PKGLIST="dnf"
  shortdist=el8
- echo "The support for this os is being worked on"
 else
  echo "This os in not supported"
  exit
@@ -79,11 +93,11 @@ unset dist_ver dist APTMODE
 
 syscheckoff=0
 if [ $TestMode = 1 ]; then
-domain=ict-dagbesteding.nl
+domain=domain.com
-sitename=ict_DB_nl
+sitename=domain_DB_com
-email=b.prieshof@ictmaatwerk.com
+email=user@provider.srv
 password=MeiFerrieSekureTESTp@ssw0rd4213
-hostname=vdh001.nxdi.nl
+hostname=srv1.servers.com
 sslenable=0
 domainwww=0
 fi
@@ -202,7 +216,7 @@ done
 #   System-Check   #
 ##----------------##
 
-if [[ "$syscheckoff" -ne 1 ]] && [[ -d /etc/ICTM ]]; then msg "             This system has already been installed by Web-V2" && exit; fi
+if [[ "$syscheckoff" -ne 1 ]] && [[ -d /etc/WebV2 ]]; then msg "             This system has already been installed by Web-V2" && exit; fi
 ##Check for pkgs, not yet setup for Centos
 # if [[ "$syscheckoff" -ne 1 ]] && [[ ! -z $(dpkg -l | cut -d " " -f 3 | grep "^mysql-server") || ! -z $(dpkg -l | cut -d " " -f 3 | grep "nginx") || ! -z $(dpkg -l | cut -d " " -f 3 | grep "apache") || ! -z $(dpkg -l | cut -d " " -f 3 | grep "php") ]] ; then msg " This system has installed packages, Web-V2 is designed for clean systems" && exit; fi
 
@@ -366,15 +380,15 @@ fi
 #   Storeing vars   #
 ##-----------------##
 
-mkdir -p /etc/ICTM/sites
+mkdir -p /etc/WebV2/sites
-echo "InstDate=$(date "+%d-%B-%Y")" >> /etc/ICTM/mainvar.list
+echo "InstDate=$(date "+%d-%B-%Y")" >> /etc/WebV2/mainvar.list
 
-for storeme in PKGM PKGI PKGUC PKGUP PKGLIST OUTPUT IMODE shortdist repo branch branchtype webserv email shortdist hostname; do
+for storeme in PKGM PKGI PKGUC PKGUP PKGLIST OUTPUT IMODE shortdist repo branch branchtype webserv email shortdist hostname CompatVer; do
-    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/mainvar.list
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/WebV2/mainvar.list
 done
 
-
+touch /etc/WebV2/sites/"$sitename"
-touch /etc/ICTM/sites/"$sitename"
+echo "SiteCount=$SiteCount" > /etc/WebV2/sites.count
 
 ##----------##
 #   Addons   #
@@ -426,7 +440,7 @@ done
 option="${option%"${option##*[![:space:]]}"}"
 fi
 #saving selected modules
-echo 'SelectedOptions=('$option')' > /etc/ICTM/selopts.list
+echo 'SelectedOptions=('$option')' > /etc/WebV2/selopts.list
 
 #Cleaning options from menu
 option="${option,,}" && option="${option// /}" && option="${option//:/ }" && option="${option//'"'}"
@@ -436,6 +450,9 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re
  source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/reqmodules.sh)
 fi
 
+#saving enabled Allways on modules
+echo 'EnabledAons=('$aonoption')' >> /etc/WebV2/selopts.list
+
 #Combining selected option with always-on options
 option="$option""$aonoption"
 
@@ -574,9 +591,27 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re
  source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-preconf.sh)
 fi
 
+#Preconfiguring module For CMS
+for val1 in ${option[*]}; do
+    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/"$branchtype"/"$branch"/SubModules/"$val1"/CMSHook-preconf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/CMSHook-preconf.sh)
+        fi
+    else
+        #Fetching from remote repo
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"CMSHook-preconf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$modListed"CMSHook-preconf.sh)
+        fi
+    fi
+done
+
 #Saving updated vars
 for storeme in phpver sqlver PHPMyadmin; do
-    declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/mainvar.list
+    declare -p $storeme | cut -d ' ' -f 3- >> /etc/WebV2/mainvar.list
 done
 
 ##-------------##
@@ -644,6 +679,8 @@ if [ $sslenable = 1 ]; then
     if test $certsatus -eq 0
     then
         site_ext="ssl"
+        mkdir -p /etc/acmesh/inst/$domain
+        /opt/acmesh/acme.sh  --config-home '/etc/acmesh/data' --install-cert --ecc --domain $domain --cert-file /etc/acmesh/inst/$domain/cert.pem --key-file /etc/acmesh/inst/$domain/key.pem --ca-file /etc/acmesh/inst/$domain/ca.cer --fullchain-file /etc/acmesh/inst/$domain/fullchain.pem --reloadcmd 'systemctl reload $(cat /etc/WebV2/SslServices)'
     else
         site_ext="nossl"
         rm -rf /etc/acmesh/certs/$domain*
@@ -655,6 +692,8 @@ if [ $sslenable = 1 ]; then
     if test $certsatusBackend -eq 0
     then
         siteBackend_ext="ssl"
+        mkdir -p /etc/acmesh/inst/$hostname
+        /opt/acmesh/acme.sh  --config-home '/etc/acmesh/data' --install-cert --ecc --domain $hostname --cert-file /etc/acmesh/inst/$hostname/cert.pem --key-file /etc/acmesh/inst/$hostname/key.pem --ca-file /etc/acmesh/inst/$hostname/ca.cer --fullchain-file /etc/acmesh/inst/$hostname/fullchain.pem --reloadcmd 'systemctl reload $(cat /etc/WebV2/SslServices)'
     else
         siteBackend_ext="nossl"
         rm -rf /etc/acmesh/certs/$hostname*
@@ -696,11 +735,37 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re
 fi
 fi
 
+#Configuring Module for CMS
+
+for val1 in ${option[*]}; do
+    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/"$branchtype"/"$branch"/SubModules/"$val1"/CMSHook-conf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/"$val1"/CMSHook-conf.sh)
+        fi
+    else
+        #Fetching from remote repo
+        if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed"CMSHook-conf.sh; then
+            source <(curl --retry 7 --retry-delay 5 -s "$modListed"CMSHook-conf.sh)
+        fi
+    fi
+done
+
 ##------------##
 #   Services   #
 ##------------##
 
-systemctl reload sshd fail2ban 
+#Set ssh service for distro
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
+   SSHService=ssh
+elif [ "$shortdist" = "el8" ]; then
+    SSHService=sshd
+fi
+
+systemctl reload $SSHService fail2ban 
 
 
 ##-------##