7x31/nginxconfig.io
1
0
Fork 0
mirror of https://github.com/digitalocean/nginxconfig.io.git synced 2025-11-04 18:28:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Let's Encrypt fixes

Browse Source
This commit is contained in:
Szekeres Bálint
2018-02-23 00:20:21 +01:00
parent 9592a489ca
commit 1a2dabd0e9
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
public/templates/conf/example.com.conf.html
View File

@@ -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() }};<!--
return 301 https://{{ isWWW() ? 'www.' : '' }}{{ domain() }}$request_uri;
✔ 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>