Let's Encrypt fixes
parent
9592a489ca
commit
1a2dabd0e9
|
@ -13,15 +13,13 @@ server {
|
|||
|
||||
โ HTTPS --><span ng-if="isHTTPS()">
|
||||
|
||||
# SSL certificate
|
||||
# SSL
|
||||
include _ssl.conf;
|
||||
ssl_certificate {{ sslCertificate() }};
|
||||
ssl_certificate_key {{ sslCertificateKey() }};<!--
|
||||
|
||||
โ Let's Encrypt --><span ng-if="isLetsEncrypt()">
|
||||
ssl_trusted_certificate /etc/letsencrypt/live/{{ domain() }}/fullchain.pem;</span>
|
||||
|
||||
# SSL config
|
||||
include _ssl.conf;</span><!--
|
||||
ssl_trusted_certificate /etc/letsencrypt/live/{{ domain() }}/fullchain.pem;</span></span><!--
|
||||
|
||||
โ unified && โ PHP --><span ng-if="isUnified() && isPHP()">
|
||||
|
||||
|
@ -40,9 +38,6 @@ server {
|
|||
|
||||
|
||||
|
||||
โ modularized && โ Let's Encrypt --><span ng-if="isModularized() && isLetsEncrypt()">
|
||||
include _letsencrypt.conf;</span><!--
|
||||
|
||||
โ modularized --><span ng-if="isModularized()">
|
||||
include _general.conf;</span><!--
|
||||
|
||||
|
@ -54,10 +49,6 @@ server {
|
|||
|
||||
|
||||
|
||||
โ unified && โ Let's Encrypt --><span ng-if="isUnified() && isLetsEncrypt()">
|
||||
|
||||
<!-- --><ng-include ng-include-tabs="2" src="'templates/conf/_letsencrypt.conf.html'" onload="refreshHighlighting()"></ng-include></span><!--
|
||||
|
||||
โ unified --><span ng-if="isUnified()">
|
||||
|
||||
<!-- --><ng-include ng-include-tabs="2" src="'templates/conf/_general.conf.html'" onload="refreshHighlighting()"></ng-include></span><!--
|
||||
|
@ -87,22 +78,13 @@ server {
|
|||
|
||||
โ HTTPS --><span ng-if="isHTTPS()">
|
||||
|
||||
# SSL certificate
|
||||
# SSL
|
||||
include _ssl.conf;
|
||||
ssl_certificate {{ sslCertificate() }};
|
||||
ssl_certificate_key {{ sslCertificateKey() }};<!--
|
||||
|
||||
โ Let's Encrypt --><span ng-if="isLetsEncrypt()">
|
||||
ssl_trusted_certificate /etc/letsencrypt/live/{{ domain() }}/fullchain.pem;</span>
|
||||
|
||||
# SSL config
|
||||
include _ssl.conf;</span><!--
|
||||
|
||||
โ modularized && โ Let's Encrypt --><span ng-if="isModularized() && isLetsEncrypt()">
|
||||
include _letsencrypt.conf;</span><!--
|
||||
|
||||
โ unified && โ Let's Encrypt --><span ng-if="isUnified() && isLetsEncrypt()">
|
||||
|
||||
<ng-include ng-include-tabs="2" src="'templates/conf/_letsencrypt.conf.html'" onload="refreshHighlighting()"></ng-include></span>
|
||||
ssl_trusted_certificate /etc/letsencrypt/live/{{ domain() }}/fullchain.pem;</span></span>
|
||||
|
||||
# disable access_log
|
||||
access_log off;<!--
|
||||
|
@ -142,13 +124,13 @@ server {
|
|||
|
||||
โ HTTPS --><span ng-if="isHTTPS()">
|
||||
|
||||
# SSL certificate
|
||||
# SSL
|
||||
include _ssl.conf;
|
||||
ssl_certificate /etc/letsencrypt/live/{{ domain() }}/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/{{ domain() }}/privkey.pem;
|
||||
ssl_trusted_certificate /etc/letsencrypt/live/{{ domain() }}/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/{{ domain() }}/privkey.pem;<!--
|
||||
|
||||
# SSL config
|
||||
include _ssl.conf;</span>
|
||||
โ Let's Encrypt --><span ng-if="isLetsEncrypt()">
|
||||
ssl_trusted_certificate /etc/letsencrypt/live/{{ domain() }}/fullchain.pem;</span></span>
|
||||
|
||||
return 301 https://{{ isWWW() ? 'www.' : '' }}{{ domain() }}$request_uri;
|
||||
}</span><!--
|
||||
|
@ -162,7 +144,23 @@ server {
|
|||
listen 80;
|
||||
listen [::]:80;
|
||||
|
||||
server_name .{{ domain() }};
|
||||
server_name .{{ domain() }};<!--
|
||||
|
||||
โ modularized && โ Let's Encrypt --><span ng-if="isModularized() && isLetsEncrypt()">
|
||||
|
||||
include _letsencrypt.conf;</span><!--
|
||||
|
||||
โ unified && โ Let's Encrypt --><span ng-if="isUnified() && isLetsEncrypt()">
|
||||
|
||||
<ng-include ng-include-tabs="2" src="'templates/conf/_letsencrypt.conf.html'" onload="refreshHighlighting()"></ng-include></span><!--
|
||||
|
||||
โ Let's Encrypt --><span ng-if="isLetsEncrypt()">
|
||||
|
||||
location / {
|
||||
return 301 https://{{ isWWW() ? 'www.' : '' }}{{ domain() }}$request_uri;
|
||||
}</span><!--
|
||||
|
||||
โ Let's Encrypt --><span ng-if="!isLetsEncrypt()">
|
||||
|
||||
return 301 https://{{ isWWW() ? 'www.' : '' }}{{ domain() }}$request_uri;</span>
|
||||
}</span>
|
||||
|
|
Loadingโฆ
Reference in New Issue