From 824ff17ee3486abb1b10fd1bc47a16bf4aecfbed Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 4 Sep 2020 11:48:50 +0200 Subject: [PATCH] Disabled Backend CMS and Phpmya for nginx_nonphp --- CMS/none/nginx_nonphp-conf.sh | 2 +- CoreModules/nginx_nonphp/preconf.sh | 4 ++++ installer.sh | 8 +++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMS/none/nginx_nonphp-conf.sh b/CMS/none/nginx_nonphp-conf.sh index 03caa24..6df107b 100644 --- a/CMS/none/nginx_nonphp-conf.sh +++ b/CMS/none/nginx_nonphp-conf.sh @@ -5,5 +5,5 @@ mkdir -p /var/www/"$domain"/html echo "$webserv has been succsefully installed by the Wizard" > /var/www/$domain/html/index.html -chown "$sitename":"$sitename" -R /var/www/"$domain"/html +chown www-data:www-data -R /var/www/"$domain"/html systemctl reload nginx \ No newline at end of file diff --git a/CoreModules/nginx_nonphp/preconf.sh b/CoreModules/nginx_nonphp/preconf.sh index 559807f..4f25ec8 100644 --- a/CoreModules/nginx_nonphp/preconf.sh +++ b/CoreModules/nginx_nonphp/preconf.sh @@ -1,2 +1,6 @@ echo "deb http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" > /etc/apt/sources.list.d/nginx.list curl -fsSL https://nginx.org/keys/nginx_signing.key | sudo apt-key add - + +#Disable PhpMyadmin and Backend cms +disbackendcms=1 +PHPMyadmin=1 \ No newline at end of file diff --git a/installer.sh b/installer.sh index 8401da3..4f14213 100644 --- a/installer.sh +++ b/installer.sh @@ -27,7 +27,7 @@ repo=https://git.ictmaatwerk.com/bprieshof/UBU-Web-V2 branch=master #Installer-config phpver=7.4 -PHPMyadmin=1 +PHPMyadmin=1 #Overwriten by cms's without php sqlver=8.0 TestMode=0 #PackageManager-config @@ -559,8 +559,10 @@ fi wget -q -t7 "$repo"/raw/branch/"$branch"/Scripts/EnableSSL.sh -O ~/activateSSL-$domain.sh sed -i -e 's/DOMAINname/'$domain'/' -e 's/CONFname/'$sitename'/' -e 's/DomainWWW/'$domainwww'/' -e 's/Email/'$email'/' -e 's/WebServer/'$webserv'/' ~/activateSSL-$domain.sh +if [ -z $disbackendcms ]; then wget -q -t7 "$repo"/raw/branch/"$branch"/Scripts/EnableSSL.sh -O ~/activateSSL-Backend.sh sed -i -e 's/DOMAINname/'$hostname'/' -e 's/CONFname/'Backend'/' -e 's/DomainWWW/'0'/' -e 's/Email/'$email'/' -e 's/WebServer/'$webserv'/' ~/activateSSL-Backend.sh +fi msg " Configuring CMS" if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/conf.sh; then @@ -570,14 +572,14 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/"$CMS"/"$webserv"-conf.sh) fi +if [ -z $disbackendcms ]; then if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/Backend/conf.sh; then source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/Backend/conf.sh) fi - if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/Backend/"$webserv"-conf.sh; then source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/Backend/"$webserv"-conf.sh) fi - +fi ##------------## # Services #