diff --git a/CMS/none/Apache-unconfigured b/CMS/none/Apache-unconfigured new file mode 100644 index 0000000..8c2f065 --- /dev/null +++ b/CMS/none/Apache-unconfigured @@ -0,0 +1,21 @@ +#beginConf + +ErrorLog ${APACHE_LOG_DIR}/s2_error.log +#CustomLog ${APACHE_LOG_DIR}/s2_custom.log combined + +DirectoryIndex index.php index.html index.htm +DocumentRoot /var/www/DOMAINname/html; + + + + Options Indexes FollowSymLinks MultiViews + AllowOverride All + Order allow,deny + allow from all + + + + SetHandler "proxy:unix:/var/run/php/phpPHPver-fpm-SITEname.sock|fcgi://localhost" + + +#endConf \ No newline at end of file diff --git a/CMS/none/apache-conf.sh b/CMS/none/apache-conf.sh new file mode 100644 index 0000000..69bdefc --- /dev/null +++ b/CMS/none/apache-conf.sh @@ -0,0 +1,9 @@ +wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/none/Apache-unconfigured -O /tmp/apache-siteconf +sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/apache-siteconf +sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/apache/sites-available/"$sitename"_"$site_ext".conf +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 +systemctl reload nginx \ No newline at end of file diff --git a/CoreModules/apache/apt.list b/CoreModules/apache/apt.list index 2cc4251..c05a90a 100644 --- a/CoreModules/apache/apt.list +++ b/CoreModules/apache/apt.list @@ -1 +1 @@ -apache2 php-pear libapache2-mod-php phpPHPver-mysql phpPHPver-cgi phpPHPver-common phpPHPver-mbstring phpPHPver-curl phpPHPver-gd phpPHPver-intl phpPHPver-soap phpPHPver-xml phpPHPver-xmlrpc phpPHPver-zip python-certbot-apache \ No newline at end of file +apache2 libapache2-mod-fcgid python-certbot-apache \ No newline at end of file diff --git a/CoreModules/apache/conf.sh b/CoreModules/apache/conf.sh new file mode 100644 index 0000000..5918e40 --- /dev/null +++ b/CoreModules/apache/conf.sh @@ -0,0 +1,29 @@ +systemctl stop apache2 + +############## +# Apache # +############## + +a2enmod actions fcgid alias proxy_fcgi ssl headers + +mkdir -p /etc/apache2/snippets/ +wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache/snippets-ssl.conf -O /etc/apache2/snippets/apa-ssl.conf +wget -q -t7 "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache/custom.conf -O /etc/apache2/conf-enabled/custom.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 + 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 + 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 +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 +#ssl +wget -q -t7 -O - "$repo"/raw/branch/"$branch"/CoreModules/apache/config/apache/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 diff --git a/CoreModules/apache/config/apache2/conf-custom.conf b/CoreModules/apache/config/apache2/conf-custom.conf new file mode 100644 index 0000000..821b694 --- /dev/null +++ b/CoreModules/apache/config/apache2/conf-custom.conf @@ -0,0 +1 @@ +SSLStaplingCache "shmcb:logs/ssl_stapling(32768)" \ No newline at end of file diff --git a/CoreModules/apache/config/apache2/site-unconfigured b/CoreModules/apache/config/apache2/site-unconfigured new file mode 100644 index 0000000..fcdf18c --- /dev/null +++ b/CoreModules/apache/config/apache2/site-unconfigured @@ -0,0 +1,6 @@ + + ServerName DOMAINname + +#ConfHere + + diff --git a/CoreModules/apache/config/apache2/site-wwwredir b/CoreModules/apache/config/apache2/site-wwwredir new file mode 100644 index 0000000..03ecf2c --- /dev/null +++ b/CoreModules/apache/config/apache2/site-wwwredir @@ -0,0 +1,4 @@ + + ServerName www.DOMAINname + Redirect permanent / http://DOMAINname/ + diff --git a/CoreModules/apache/config/apache2/site_ssl-unconfigured b/CoreModules/apache/config/apache2/site_ssl-unconfigured new file mode 100644 index 0000000..fe060cd --- /dev/null +++ b/CoreModules/apache/config/apache2/site_ssl-unconfigured @@ -0,0 +1,16 @@ + + ServerName DOMAINname + Redirect permanent / https://DOMAINname/ + + + + ServerName DOMAINname + SSLEngine on + SSLCertificateFile /etc/letsencrypt/live/DOMAINname/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/DOMAINname/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/DOMAINname/chain.pem + Include snippets/apa-ssl.conf + +#ConfHere + + \ No newline at end of file diff --git a/CoreModules/apache/config/apache2/site_ssl-wwwredir b/CoreModules/apache/config/apache2/site_ssl-wwwredir new file mode 100644 index 0000000..1b6fd32 --- /dev/null +++ b/CoreModules/apache/config/apache2/site_ssl-wwwredir @@ -0,0 +1,14 @@ + + ServerName www.DOMAINname + Redirect permanent / https://DOMAINname/ + + + + ServerName www.DOMAINname + SSLEngine on + SSLCertificateFile /etc/letsencrypt/live/DOMAINname/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/DOMAINname/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/DOMAINname/chain.pem + Include snippets/apa-ssl.conf + Redirect permanent / https://DOMAINname/ + \ No newline at end of file diff --git a/CoreModules/apache/config/apache2/snippets-ssl.conf b/CoreModules/apache/config/apache2/snippets-ssl.conf new file mode 100644 index 0000000..3cbc060 --- /dev/null +++ b/CoreModules/apache/config/apache2/snippets-ssl.conf @@ -0,0 +1,7 @@ +Protocols h2 http/1.1 +Header always set Strict-Transport-Security "max-age=63072000" +SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1 +SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA2$ +SSLHonorCipherOrder off +SSLSessionTickets off +SSLUseStapling On diff --git a/CoreModules/apache/preconf.sh b/CoreModules/apache/preconf.sh new file mode 100644 index 0000000..111461a --- /dev/null +++ b/CoreModules/apache/preconf.sh @@ -0,0 +1 @@ +sudo add-apt-repository ppa:ondrej/apache2 \ No newline at end of file diff --git a/CoreModules/apache/reqmodules.sh b/CoreModules/apache/reqmodules.sh new file mode 100644 index 0000000..ae87c0f --- /dev/null +++ b/CoreModules/apache/reqmodules.sh @@ -0,0 +1 @@ +aonoption="$aonoption php-fpm" \ No newline at end of file