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

Main: Added fix SSL issue described #12

Browse Source
This commit is contained in:
Bram Prieshof
2021-03-24 15:06:54 +01:00
parent 269998a2af
commit dda74005f5
9 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreModules/apache/conf.sh
View File

@@ -66,9 +66,11 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/to
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/ICTM/SslServices
systemctl start $apacheService > $OUTPUT 2>&1
systemctl enable $apacheService > $OUTPUT 2>&1

4
CoreModules/apache/config/apache2/site_ssl-unconfigured
View File

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

4
CoreModules/apache/config/apache2/site_ssl-wwwredir
View File

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

4
CoreModules/nginx/conf.sh
View File

@@ -51,9 +51,11 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/to
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/ICTM/SslServices
systemctl start nginx > $OUTPUT 2>&1
systemctl enable nginx > $OUTPUT 2>&1

6
CoreModules/nginx/config/nginx/site_ssl-unconfigured
View File

@@ -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_key /etc/acmesh/certs/DOMAINname_ecc/DOMAINname.key;
ssl_trusted_certificate /etc/acmesh/certs/DOMAINname_ecc/fullchain.cer;
ssl_certificate /etc/acmesh/inst/DOMAINname/fullchain.pem;
ssl_certificate_key /etc/acmesh/inst/DOMAINname/key.pem;
ssl_trusted_certificate /etc/acmesh/inst/DOMAINname/fullchain.pem;
include snippets/ngx-ssl.conf;

6
CoreModules/nginx/config/nginx/site_ssl-wwwredir
View File

@@ -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_key /etc/acmesh/certs/DOMAINname_ecc/DOMAINname.key;
ssl_trusted_certificate /etc/acmesh/certs/DOMAINname_ecc/fullchain.cer;
ssl_certificate /etc/acmesh/inst/DOMAINname/fullchain.pem;
ssl_certificate_key /etc/acmesh/inst/DOMAINname/key.pem;
ssl_trusted_certificate /etc/acmesh/inst/DOMAINname/fullchain.pem;
include snippets/ngx-ssl.conf;
return 301 https://DOMAINname$request_uri;
}

3
CoreModules/nginx_nonphp/conf.sh
View File

@@ -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/ICTM/SslServices
systemctl start nginx > $OUTPUT 2>&1
systemctl enable nginx > $OUTPUT 2>&1