aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2019-09-22 10:26:58 +0800
committerAaron LI <aly@aaronly.me>2019-09-22 10:26:58 +0800
commitdd3ceb9c0ce5bce17ecb7eab06612f9abd973955 (patch)
tree3d225679d3f7fcd6b2cf7ffb5b914f39f0a3c5f9
parent9dd199d6349a7f521d98a7de4ef680a5f782e1c9 (diff)
downloadansible-dfly-vps-dd3ceb9c0ce5bce17ecb7eab06612f9abd973955.tar.bz2
web/sites: Update certificate paths
-rw-r--r--roles/web/templates/sites/1314233.conf.j24
-rw-r--r--roles/web/templates/sites/233233.d.conf.j24
-rw-r--r--roles/web/templates/sites/233233.g.conf.j24
-rw-r--r--roles/web/templates/sites/233233.zw.conf.j24
-rw-r--r--roles/web/templates/sites/aaronly.conf.j24
-rw-r--r--roles/web/templates/sites/liwt.cgit.conf.j24
-rw-r--r--roles/web/templates/sites/liwt.radicale.conf.j24
-rw-r--r--roles/web/templates/sites/liwt.www.conf.j28
8 files changed, 18 insertions, 18 deletions
diff --git a/roles/web/templates/sites/1314233.conf.j2 b/roles/web/templates/sites/1314233.conf.j2
index 57994ee..de6d56f 100644
--- a/roles/web/templates/sites/1314233.conf.j2
+++ b/roles/web/templates/sites/1314233.conf.j2
@@ -14,8 +14,8 @@ server {
server_name {{ domain }} *.{{ domain }};
# SSL/TLS Certificate kindly provided by Let's Encrypt
- ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem;
- ssl_certificate_key /usr/local/etc/ssl/acme/private/{{ domain }}.pem;
+ ssl_certificate {{ web.ssl_root }}/{{ domain }}/fullchain;
+ ssl_certificate_key {{ web.ssl_root }}/{{ domain }}/key;
return 301 $scheme://{{ domain_new }}$request_uri;
}
diff --git a/roles/web/templates/sites/233233.d.conf.j2 b/roles/web/templates/sites/233233.d.conf.j2
index f709040..0128b37 100644
--- a/roles/web/templates/sites/233233.d.conf.j2
+++ b/roles/web/templates/sites/233233.d.conf.j2
@@ -13,8 +13,8 @@ server {
server_name d.{{ domain }};
# SSL/TLS Certificate kindly provided by Let's Encrypt
- ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem;
- ssl_certificate_key /usr/local/etc/ssl/acme/private/{{ domain }}.pem;
+ ssl_certificate {{ web.ssl_root }}/{{ domain }}/fullchain;
+ ssl_certificate_key {{ web.ssl_root }}/{{ domain }}/key;
# Enable caching
#proxy_cache CACHE;
diff --git a/roles/web/templates/sites/233233.g.conf.j2 b/roles/web/templates/sites/233233.g.conf.j2
index 1197b9f..f4b73fd 100644
--- a/roles/web/templates/sites/233233.g.conf.j2
+++ b/roles/web/templates/sites/233233.g.conf.j2
@@ -24,8 +24,8 @@ server {
server_name g.{{ domain }};
# SSL/TLS Certificate kindly provided by Let's Encrypt
- ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem;
- ssl_certificate_key /usr/local/etc/ssl/acme/private/{{ domain }}.pem;
+ ssl_certificate {{ web.ssl_root }}/{{ domain }}/fullchain;
+ ssl_certificate_key {{ web.ssl_root }}/{{ domain }}/key;
# Enable caching
#proxy_cache CACHE;
diff --git a/roles/web/templates/sites/233233.zw.conf.j2 b/roles/web/templates/sites/233233.zw.conf.j2
index a17457e..65e276f 100644
--- a/roles/web/templates/sites/233233.zw.conf.j2
+++ b/roles/web/templates/sites/233233.zw.conf.j2
@@ -16,8 +16,8 @@ server {
server_name zw.{{ domain }};
# SSL/TLS Certificate kindly provided by Let's Encrypt
- ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem;
- ssl_certificate_key /usr/local/etc/ssl/acme/private/{{ domain }}.pem;
+ ssl_certificate {{ web.ssl_root }}/{{ domain }}/fullchain;
+ ssl_certificate_key {{ web.ssl_root }}/{{ domain }}/key;
# Enable caching
#proxy_cache CACHE;
diff --git a/roles/web/templates/sites/aaronly.conf.j2 b/roles/web/templates/sites/aaronly.conf.j2
index b1fb481..d131aa0 100644
--- a/roles/web/templates/sites/aaronly.conf.j2
+++ b/roles/web/templates/sites/aaronly.conf.j2
@@ -14,8 +14,8 @@ server {
server_name {{ domain }} *.{{ domain }};
# SSL/TLS Certificate kindly provided by Let's Encrypt
- ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem;
- ssl_certificate_key /usr/local/etc/ssl/acme/private/{{ domain }}.pem;
+ ssl_certificate {{ web.ssl_root }}/{{ domain }}/fullchain;
+ ssl_certificate_key {{ web.ssl_root }}/{{ domain }}/key;
return 301 $scheme://{{ domain_new }}$request_uri;
}
diff --git a/roles/web/templates/sites/liwt.cgit.conf.j2 b/roles/web/templates/sites/liwt.cgit.conf.j2
index 50f61db..1fe4d00 100644
--- a/roles/web/templates/sites/liwt.cgit.conf.j2
+++ b/roles/web/templates/sites/liwt.cgit.conf.j2
@@ -20,8 +20,8 @@ server {
server_name git.{{ domain }};
# SSL/TLS Certificate kindly provided by Let's Encrypt
- ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem;
- ssl_certificate_key /usr/local/etc/ssl/acme/private/{{ domain }}.pem;
+ ssl_certificate {{ web.ssl_root }}/{{ domain }}/fullchain;
+ ssl_certificate_key {{ web.ssl_root }}/{{ domain }}/key;
# Projects (git repositories) location
root /usr/local/www/cgit;
diff --git a/roles/web/templates/sites/liwt.radicale.conf.j2 b/roles/web/templates/sites/liwt.radicale.conf.j2
index 4ca818a..e038765 100644
--- a/roles/web/templates/sites/liwt.radicale.conf.j2
+++ b/roles/web/templates/sites/liwt.radicale.conf.j2
@@ -14,8 +14,8 @@ server {
server_name dav.{{ domain }};
# SSL/TLS Certificate kindly provided by Let's Encrypt
- ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem;
- ssl_certificate_key /usr/local/etc/ssl/acme/private/{{ domain }}.pem;
+ ssl_certificate {{ web.ssl_root }}/{{ domain }}/fullchain;
+ ssl_certificate_key {{ web.ssl_root }}/{{ domain }}/key;
# Reverse proxy to Radicale
location / {
diff --git a/roles/web/templates/sites/liwt.www.conf.j2 b/roles/web/templates/sites/liwt.www.conf.j2
index f13c475..673328e 100644
--- a/roles/web/templates/sites/liwt.www.conf.j2
+++ b/roles/web/templates/sites/liwt.www.conf.j2
@@ -26,8 +26,8 @@ server {
server_name www.{{ domain }};
# SSL/TLS Certificate kindly provided by Let's Encrypt
- ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem;
- ssl_certificate_key /usr/local/etc/ssl/acme/private/{{ domain }}.pem;
+ ssl_certificate {{ web.ssl_root }}/{{ domain }}/fullchain;
+ ssl_certificate_key {{ web.ssl_root }}/{{ domain }}/key;
return 301 $scheme://{{ domain }}$request_uri;
}
@@ -38,8 +38,8 @@ server {
server_name {{ domain }};
# SSL/TLS Certificate kindly provided by Let's Encrypt
- ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem;
- ssl_certificate_key /usr/local/etc/ssl/acme/private/{{ domain }}.pem;
+ ssl_certificate {{ web.ssl_root }}/{{ domain }}/fullchain;
+ ssl_certificate_key {{ web.ssl_root }}/{{ domain }}/key;
# Website location
root /home/www/www;