Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

Update references to new git location

Browse Source 
Changed Web-V2 config location to /etc/WebV2
This commit is contained in:
Bram Prieshof
2023-07-02 20:43:33 +02:00
parent be98df66a9
commit 6922ea61b2
34 changed files with 136 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
AppendCMS.sh
View File

@@ -12,26 +12,26 @@ ScriptCompat=2
# Fetching Vars # # 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/ICTM/selopts.list source /etc/WebV2/selopts.list
source /etc/ICTM/mainvar.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 ${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 [ -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 [ $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 fi
if [ $webserv = apache ]; then 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 fi
rm /tmp/pkg.list > $OUTPUT 2>&1 rm /tmp/pkg.list > $OUTPUT 2>&1
source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list) source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list)
#SiteCount #SiteCount
if [ ! -f "/etc/ICTM/sites.count" ]; then SiteCount=`expr $(ls -l /var/www | grep -c ^d) - 1` ; else source /etc/ICTM/sites.count; fi 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 if [ -z ${SiteCount+x} ] ; then SiteCount=`expr $(ls -l /var/www | grep -c ^d) - 1` ; fi
SiteCount=$(($SiteCount+1)) SiteCount=$(($SiteCount+1))
@@ -178,8 +178,8 @@ CMS="${CMS//:}" && CMS="${CMS,,}"
# Storeing vars # # Storeing vars #
##-----------------## ##-----------------##
touch /etc/ICTM/sites/"$sitename" touch /etc/WebV2/sites/"$sitename"
echo "SiteCount=$SiteCount" > /etc/ICTM/sites.count echo "SiteCount=$SiteCount" > /etc/WebV2/sites.count
##-----------## ##-----------##
@@ -279,7 +279,7 @@ msg " Setting up SSL"
then then
site_ext="ssl" site_ext="ssl"
mkdir -p /etc/acmesh/inst/$domain 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/ICTM/SslServices)' /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 else
site_ext="nossl" site_ext="nossl"
rm -rf /etc/acmesh/certs/$domain* rm -rf /etc/acmesh/certs/$domain*

16
AppendModule.sh
View File

@@ -12,20 +12,20 @@ ScriptCompat=2
# Fetching Vars # # 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/ICTM/selopts.list source /etc/WebV2/selopts.list
source /etc/ICTM/mainvar.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 ${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 [ -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 [ $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 fi
if [ $webserv = apache ]; then 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 fi
rm /tmp/pkg.list rm /tmp/pkg.list
source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list) source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list)
@@ -151,7 +151,7 @@ done
option="${option%"${option##*[![:space:]]}"}" option="${option%"${option##*[![:space:]]}"}"
fi fi
echo 'SelectedOptions+=('$option')' >> /etc/ICTM/selopts.list echo 'SelectedOptions+=('$option')' >> /etc/WebV2/selopts.list
#Cleaning options from menu #Cleaning options from menu

4
CMS/wordpress/wordpress-init.sh
View File

@@ -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 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 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 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 cron event run wp_update_plugins
sudo -u SITEname /usr/local/bin/wp --path=/var/www/DOMAINname/html plugin update --all 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 sn2=SITEname
rm -f /etc/update-motd.d/51-wpnotice-${sn2//_} rm -f /etc/update-motd.d/51-wpnotice-${sn2//_}

2
CoreModules/apache/conf.sh
View File

@@ -70,7 +70,7 @@ unset monitconf
echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /var/www/html/index.html echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /var/www/html/index.html
#Add Apache as SSL service #Add Apache as SSL service
echo "$apacheService" >> /etc/ICTM/SslServices echo "$apacheService" >> /etc/WebV2/SslServices
systemctl start $apacheService > $OUTPUT 2>&1 systemctl start $apacheService > $OUTPUT 2>&1
systemctl enable $apacheService > $OUTPUT 2>&1 systemctl enable $apacheService > $OUTPUT 2>&1

4
CoreModules/apache/phpupdate-handeler.sh
View File

@@ -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 for f in $apacheConfDir/sites-available/*; do
if [ $IMODE = n ] && [ $PhpPurge = 0 ]; then if [ $IMODE = n ] && [ $PhpPurge = 0 ]; then

4
CoreModules/apache/preconf.sh
View File

@@ -11,7 +11,7 @@ fi
#Storing vars to config #Storing vars to config
for storeme in apacheService apacheConfDir; do 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 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

8
CoreModules/generic/preconf.sh
View File

@@ -6,7 +6,7 @@ if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist
# Repositories # # 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 # # System #
##------------## ##------------##
@@ -39,7 +39,7 @@ elif [ "$shortdist" = "el8" ]; then
# Repositories # # 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 # # System #
@@ -65,13 +65,13 @@ fi
# Prerequisite packages # # 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 # # 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 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
##------------## ##------------##

2
CoreModules/nginx/conf.sh
View File

@@ -55,7 +55,7 @@ unset monitconf
echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /usr/share/nginx/html/index.html echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /usr/share/nginx/html/index.html
#Add Nginx as SSL service #Add Nginx as SSL service
echo "nginx" >> /etc/ICTM/SslServices echo "nginx" >> /etc/WebV2/SslServices
systemctl start nginx > $OUTPUT 2>&1 systemctl start nginx > $OUTPUT 2>&1
systemctl enable nginx > $OUTPUT 2>&1 systemctl enable nginx > $OUTPUT 2>&1

2
CoreModules/nginx/preconf.sh
View File

@@ -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

2
CoreModules/nginx_nonphp/conf.sh
View File

@@ -29,7 +29,7 @@ sed -i -e 's/DOMAINname/'$domain'/g' /etc/nginx/sites-available/"$sitename"_ssl
echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /usr/share/nginx/html/index.html echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /usr/share/nginx/html/index.html
#Add Nginx as SSL service #Add Nginx as SSL service
echo "nginx" >> /etc/ICTM/SslServices echo "nginx" >> /etc/WebV2/SslServices
systemctl start nginx > $OUTPUT 2>&1 systemctl start nginx > $OUTPUT 2>&1
systemctl enable nginx > $OUTPUT 2>&1 systemctl enable nginx > $OUTPUT 2>&1

2
CoreModules/nginx_nonphp/preconf.sh
View File

@@ -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 #Disable PhpMyadmin and Backend cms
disbackendcms=1 disbackendcms=1

2
Docs/Readme.md
View File

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

2
Docs/docs/Dev-Adding-Modules.md
View File

@@ -60,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 Make sure the the entry is quoted, otherwise the installer will break
### Extra step for external modules ### Extra step for external modules
For external modules the raw git url shoud be added to “extModules.list” 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/

12
Docs/docs/User-MainInfo.md
View File

@@ -2,36 +2,36 @@
Using curl 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 bash /tmp/installer.sh
``` ```
Using wget 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 bash /tmp/installer.sh
``` ```
# Getting/using the Legacy installer (installer.sh): # Getting/using the Legacy installer (installer.sh):
Using curl 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 bash /tmp/installer.sh -l 2>&1 | tee ~/output.log
``` ```
Using wget 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 bash /tmp/installer.sh -l 2>&1 | tee ~/output.log
``` ```
# Adding a Domain (AppendCMS.sh): # 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. 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): # Adding a Module/Option (AppendModule.sh):
The script wil get most information it need from stored config 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)
``` ```

2
Docs/mkdocs.yml
View File

@@ -1,7 +1,7 @@
site_name: Web-V2 site_name: Web-V2
theme: slate theme: slate
repo_name: 'Git Repo' 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: nav:
- User: 'User-MainInfo.md' - User: 'User-MainInfo.md'
- Development: - Development:

20
PhpUpdater.sh
View File

@@ -1,20 +1,20 @@
#sysCheck #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 rm /tmp/pkg.list
#Getting variables #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 [ -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" ]; then if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ]; then
# Ubuntu Php variable # Ubuntu Php variable
apt update apt update
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.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=php bash' && exit ; fi 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//'` 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" ]; then elif [ "$shortdist" = "deb10" ]|| [ "$shortdist" = "deb11" ]; then
# Debian Php variable # Debian Php variable
apt update 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.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=php bash' && exit ; fi 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//'` 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 elif [ "$shortdist" = "el8" ]; then
dnf check-update --refresh dnf check-update --refresh
@@ -126,13 +126,13 @@ systemctl start $newphpFPMService
systemctl enable $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 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 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 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) source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/phpupdate-handeler.sh)

13
README.md
View File

@@ -3,36 +3,36 @@
**Default/Graphical installer**: **Default/Graphical installer**:
Using curl 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 bash /tmp/installer.sh
``` ```
Using wget 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 bash /tmp/installer.sh
``` ```
**Legacy Installer for developing and debugging**: **Legacy Installer for developing and debugging**:
Using curl 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 bash /tmp/installer.sh -l 2>&1 | tee ~/output.log
``` ```
Using wget 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 bash /tmp/installer.sh -l 2>&1 | tee ~/output.log
``` ```
## Adding extra CMS/Site after instalation ## 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 ## 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: ### This script uses the following repo's as dependencies:
@@ -42,4 +42,3 @@ bash <(curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts
``` ```
----- -----
### Further documentation can be found at https://git.ictmaatwerk.com/docs/Web-V2/

8
Scripts/Compat/Compat-V2.sh
View File

@@ -1,7 +1,7 @@
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
#Getting information and vars #Getting information and vars
source /etc/ICTM/mainvar.list source /etc/WebV2/mainvar.list
#CompatUpdater Setup #CompatUpdater Setup
UpdaterCompatTo=2 UpdaterCompatTo=2
@@ -17,7 +17,7 @@ aonoption="/MySQL/"
aonoption="$aonoption /Unattended-Security-Updates/" aonoption="$aonoption /Unattended-Security-Updates/"
aonoption="$aonoption /Backup-Util/" aonoption="$aonoption /Backup-Util/"
aonoption="$aonoption /AcmeSH/" aonoption="$aonoption /AcmeSH/"
echo 'EnabledAons=('$aonoption')' >> /etc/ICTM/selopts.list echo 'EnabledAons=('$aonoption')' >> /etc/WebV2/selopts.list
declare -p CompatVer | cut -d ' ' -f 3- >> /etc/ICTM/mainvar.list declare -p CompatVer | cut -d ' ' -f 3- >> /etc/WebV2/mainvar.list
printf " [\033[0;32mok\033[0m]\n" printf " [\033[0;32mok\033[0m]\n"

6
Scripts/EnableSSL.sh
View File

@@ -1,5 +1,5 @@
#loading install vars #loading install vars
source /etc/ICTM/mainvar.list source /etc/WebV2/mainvar.list
#Setting Vars #Setting Vars
sitename=CONFname sitename=CONFname
domain=DOMAINname domain=DOMAINname
@@ -9,7 +9,7 @@ webservice=WebServer
#Correcting service name for Apache #Correcting service name for Apache
if [ $webservice = apache ]; then\ if [ $webservice = apache ]; then\
source /etc/ICTM/apachevar.list source /etc/WebV2/apachevar.list
webservice="$apacheService" webservice="$apacheService"
ext=.conf ext=.conf
fi fi
@@ -38,7 +38,7 @@ if test $certsatus -eq 0
then then
site_ext="ssl" site_ext="ssl"
mkdir -p /etc/acmesh/inst/$domain 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/ICTM/SslServices)' /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 else
site_ext="nossl" site_ext="nossl"
rm -rf /etc/acmesh/certs/$domain* rm -rf /etc/acmesh/certs/$domain*

6
Scripts/GenerateApacheList.sh
View File

@@ -1,5 +1,5 @@
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 [ -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" ] || [ "$shortdist" = "deb11" ] ; then if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
@@ -15,5 +15,5 @@ fi
#Storing vars to config #Storing vars to config
for storeme in apacheService apacheConfDir; do 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 done

6
Scripts/GeneratePhplist.sh
View File

@@ -1,5 +1,5 @@
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 [ -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" ] || [ "$shortdist" = "deb11" ] ; then if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
@@ -19,5 +19,5 @@ fi
#Storing vars to config #Storing vars to config
for storeme in phpPoolDir phpPkgName phpMainConf phpFPMService; do 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 done

6
Scripts/Php-EnableSessionsToRam.sh
View File

@@ -9,9 +9,9 @@
####################################################### #######################################################
#sysCheck #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
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
#Stop php service #Stop php service
systemctl stop $phpFPMService systemctl stop $phpFPMService

6
Scripts/SMI.sh
View File

@@ -66,8 +66,8 @@ unset dist_ver dist APTMODE
#Repo Vars #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 branchtype=branch
###Select Module type ###Select Module type
@@ -137,7 +137,7 @@ fi
##--------------------## ##--------------------##
msg " Preconfiguring" 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 $PKGUC
$PKGUP $PKGUP

12
Scripts/toggles/toggle-Monit_APACHE.sh
View File

@@ -7,25 +7,25 @@ function usage {
echo echo
} }
if [ -n "$1" ]; then if [ -n "$1" ]; then
if [[ ! -f /etc/ICTM/toggle.conf ]]; then if [[ ! -f /etc/WebV2/toggle.conf ]]; then
echo "Creating File" echo "Creating File"
touch /etc/ICTM/toggle.conf touch /etc/WebV2/toggle.conf
fi fi
source /etc/ICTM/toggle.conf source /etc/WebV2/toggle.conf
if [ -z "$MonitWeb" ]; then if [ -z "$MonitWeb" ]; then
echo "Creating Var" echo "Creating Var"
echo "MonitWeb=3" >> /etc/ICTM/toggle.conf echo "MonitWeb=3" >> /etc/WebV2/toggle.conf
MonitWeb=3 MonitWeb=3
fi fi
if [[ "$1" = "-d" && "$MonitWeb" != 0 ]]; then if [[ "$1" = "-d" && "$MonitWeb" != 0 ]]; then
echo "Disable MonitWebui" echo "Disable MonitWebui"
sed -i '/MonitWeb=/c\MonitWeb=0' /etc/ICTM/toggle.conf 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 --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 sed -i '/#enables\/disables monit-websocket/ s/^#*/#/' MONITCONF
systemctl reload APASRV monit systemctl reload APASRV monit
elif [[ "$1" = "-e" && "$MonitWeb" != 1 ]]; then elif [[ "$1" = "-e" && "$MonitWeb" != 1 ]]; then
echo "Enable MonitWebui" echo "Enable MonitWebui"
sed -i '/MonitWeb=/c\MonitWeb=1' /etc/ICTM/toggle.conf 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 --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 sed -i '/#enables\/disables monit-websocket/ s/^.//' MONITCONF
systemctl reload APASRV monit systemctl reload APASRV monit

12
Scripts/toggles/toggle-Monit_NGINX.sh
View File

@@ -7,25 +7,25 @@ function usage {
echo echo
} }
if [ -n "$1" ]; then if [ -n "$1" ]; then
if [[ ! -f /etc/ICTM/toggle.conf ]]; then if [[ ! -f /etc/WebV2/toggle.conf ]]; then
echo "Creating File" echo "Creating File"
touch /etc/ICTM/toggle.conf touch /etc/WebV2/toggle.conf
fi fi
source /etc/ICTM/toggle.conf source /etc/WebV2/toggle.conf
if [ -z "$MonitWeb" ]; then if [ -z "$MonitWeb" ]; then
echo "Creating Var" echo "Creating Var"
echo "MonitWeb=3" >> /etc/ICTM/toggle.conf echo "MonitWeb=3" >> /etc/WebV2/toggle.conf
MonitWeb=3 MonitWeb=3
fi fi
if [[ "$1" = "-d" && "$MonitWeb" != 0 ]]; then if [[ "$1" = "-d" && "$MonitWeb" != 0 ]]; then
echo "Disable MonitWebui" echo "Disable MonitWebui"
sed -i '/MonitWeb=/c\MonitWeb=0' /etc/ICTM/toggle.conf 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 --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 sed -i '/#enables\/disables monit-websocket/ s/^#*/#/' MONITCONF
systemctl reload nginx monit systemctl reload nginx monit
elif [[ "$1" = "-e" && "$MonitWeb" != 1 ]]; then elif [[ "$1" = "-e" && "$MonitWeb" != 1 ]]; then
echo "Enable MonitWebui" echo "Enable MonitWebui"
sed -i '/MonitWeb=/c\MonitWeb=1' /etc/ICTM/toggle.conf 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 --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 sed -i '/#enables\/disables monit-websocket/ s/^.//' MONITCONF
systemctl reload nginx monit systemctl reload nginx monit

12
Scripts/toggles/toggle-Netdata_NGINX.sh
View File

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

12
Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh
View File

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

12
Scripts/toggles/toggle-PhpMyAdmin_NGINX.sh
View File

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

2
SubModules/php-fpm/preconf.sh
View File

@@ -35,5 +35,5 @@ fi
#Storing vars to config #Storing vars to config
for storeme in phpPoolDir phpPkgName phpMainConf phpFPMService phpVerBranch; do 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 done

4
SubModules/postfix/Postfix-EnableSSL.sh
View File

@@ -1,7 +1,7 @@
#Sript for setting up SSL/TLS for Postfix (Web-V2) #Sript for setting up SSL/TLS for Postfix (Web-V2)
##Loading install vars ##Loading install vars
source /etc/ICTM/mainvar.list source /etc/WebV2/mainvar.list
##Checking if hostname cert exists ##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 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
@@ -15,7 +15,7 @@ printf " [\e[1;32m Ok \e[0m]\n"
##Adding postfix to SSL services (so it gets reloaded when a the cert is renewd) ##Adding postfix to SSL services (so it gets reloaded when a the cert is renewd)
printf "Updating SSL services list" printf "Updating SSL services list"
echo "postfix" >> /etc/ICTM/SslServices echo "postfix" >> /etc/WebV2/SslServices
printf " [\e[1;32m Ok \e[0m]\n" printf " [\e[1;32m Ok \e[0m]\n"
##Remove script ##Remove script

2
SubModules/postfix/conf.sh
View File

@@ -95,7 +95,7 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules
#if using Append module run for existing cms/sites #if using Append module run for existing cms/sites
if [ "$itype" = "AddMod" ]; then if [ "$itype" = "AddMod" ]; then
for file in /etc/ICTM/sites/*; do for file in /etc/WebV2/sites/*; do
sitename="${file##*/}" sitename="${file##*/}"
domain=${sitename//_/.} 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-preconf.sh)

2
SubModules/redis/preconf.sh
View File

@@ -10,4 +10,4 @@ elif [ "$shortdist" = "el8" ]; then
fi 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

9
extModules.list
View File

@@ -1,5 +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/
https://git.ictmaatwerk.com/VPS-scripts/MariaDB/raw/branch/master/

36
installer.sh
View File

@@ -29,12 +29,12 @@ fi
##---------------## ##---------------##
#Git-repo #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 branchtype=branch #=branch for branch and =tag for release
CompatVer=2 CompatVer=2
#Installer-config #Installer-config
phpver=7.4 phpver=8.1
PHPMyadmin=1 #Overwriten by cms's without php PHPMyadmin=1 #Overwriten by cms's without php
sqlver=8.0 sqlver=8.0
SiteCount=1 SiteCount=1
@@ -93,11 +93,11 @@ unset dist_ver dist APTMODE
syscheckoff=0 syscheckoff=0
if [ $TestMode = 1 ]; then 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 password=MeiFerrieSekureTESTp@ssw0rd4213
hostname=vdh001.nxdi.nl hostname=srv1.servers.com
sslenable=0 sslenable=0
domainwww=0 domainwww=0
fi fi
@@ -216,7 +216,7 @@ done
# System-Check # # 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 ##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 # 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
@@ -380,15 +380,15 @@ fi
# Storeing vars # # 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 CompatVer; 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 done
touch /etc/ICTM/sites/"$sitename" touch /etc/WebV2/sites/"$sitename"
echo "SiteCount=$SiteCount" > /etc/ICTM/sites.count echo "SiteCount=$SiteCount" > /etc/WebV2/sites.count
##----------## ##----------##
# Addons # # Addons #
@@ -440,7 +440,7 @@ done
option="${option%"${option##*[![:space:]]}"}" option="${option%"${option##*[![:space:]]}"}"
fi fi
#saving selected modules #saving selected modules
echo 'SelectedOptions=('$option')' > /etc/ICTM/selopts.list echo 'SelectedOptions=('$option')' > /etc/WebV2/selopts.list
#Cleaning options from menu #Cleaning options from menu
option="${option,,}" && option="${option// /}" && option="${option//:/ }" && option="${option//'"'}" option="${option,,}" && option="${option// /}" && option="${option//:/ }" && option="${option//'"'}"
@@ -451,7 +451,7 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re
fi fi
#saving enabled Allways on modules #saving enabled Allways on modules
echo 'EnabledAons=('$aonoption')' >> /etc/ICTM/selopts.list echo 'EnabledAons=('$aonoption')' >> /etc/WebV2/selopts.list
#Combining selected option with always-on options #Combining selected option with always-on options
option="$option""$aonoption" option="$option""$aonoption"
@@ -611,7 +611,7 @@ done
#Saving updated vars #Saving updated vars
for storeme in phpver sqlver PHPMyadmin; do 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 done
##-------------## ##-------------##
@@ -680,7 +680,7 @@ if [ $sslenable = 1 ]; then
then then
site_ext="ssl" site_ext="ssl"
mkdir -p /etc/acmesh/inst/$domain 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/ICTM/SslServices)' /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 else
site_ext="nossl" site_ext="nossl"
rm -rf /etc/acmesh/certs/$domain* rm -rf /etc/acmesh/certs/$domain*
@@ -693,7 +693,7 @@ if [ $sslenable = 1 ]; then
then then
siteBackend_ext="ssl" siteBackend_ext="ssl"
mkdir -p /etc/acmesh/inst/$hostname 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/ICTM/SslServices)' /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 else
siteBackend_ext="nossl" siteBackend_ext="nossl"
rm -rf /etc/acmesh/certs/$hostname* rm -rf /etc/acmesh/certs/$hostname*