From e9d03d5393f196ba06a536ac6c75b22174a085ee Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 21 Aug 2020 12:02:41 +0000 Subject: [PATCH] Update 'CoreModules/apache/conf.sh' --- CoreModules/apache/conf.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CoreModules/apache/conf.sh b/CoreModules/apache/conf.sh index 73b13e7..a4d1337 100644 --- a/CoreModules/apache/conf.sh +++ b/CoreModules/apache/conf.sh @@ -13,18 +13,18 @@ wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/conf- if [ $domainwww = 1 ]; then #non-ssl - wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache/site-wwwredir >> /etc/apache2/sites-available/"$sitename"_nossl.conf + wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site-wwwredir >> /etc/apache2/sites-available/"$sitename"_nossl.conf echo "" >> /etc/apache2/sites-available/"$sitename"_nossl.conf #ssl - wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache/site_ssl-wwwredir >> /etc/apache2/sites-available/"$sitename"_ssl.conf + wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site_ssl-wwwredir >> /etc/apache2/sites-available/"$sitename"_ssl.conf echo "" >> /etc/apache2/sites-available/"$sitename"_ssl.conf fi #non-ssl -wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache/site-unconfigured >> /etc/apache2/sites-available/"$sitename"_nossl.conf +wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site-unconfigured >> /etc/apache2/sites-available/"$sitename"_nossl.conf sed -i -e 's/DOMAINname/'$domain'/' /etc/apache2/sites-available/"$sitename"_nossl.conf -ln -s /etc/apache2/sites-available/"$sitename"_nossl /etc/apache2/sites-enabled/"$sitename".conf +ln -s /etc/apache2/sites-available/"$sitename"_nossl.conf /etc/apache2/sites-enabled/"$sitename".conf #ssl -wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache/site_ssl-unconfigured >> /etc/apache2/sites-available/"$sitename"_ssl.conf +wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache2/site_ssl-unconfigured >> /etc/apache2/sites-available/"$sitename"_ssl.conf sed -i -e 's/DOMAINname/'$domain'/' /etc/apache2/sites-available/"$sitename"_ssl.conf systemctl start apache2 \ No newline at end of file