diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2023-08-09 14:38:23 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2023-08-20 22:12:03 +0200 |
| commit | bc98352d3e331003db625be96139b3c1f95f63b2 (patch) | |
| tree | 6f05ce12309fb46aaa9c9eee692573b49b692e4d /chaos-at-home | |
| parent | prepare test setups for new acme/cert roles (diff) | |
nginx/vhost: major change in certifcate/tls handling (WIP)
Diffstat (limited to 'chaos-at-home')
| -rw-r--r-- | chaos-at-home/ch-http-proxy.yml | 13 | ||||
| -rw-r--r-- | chaos-at-home/ch-mimas.yml | 3 | ||||
| -rw-r--r-- | chaos-at-home/ch-pan.yml | 3 | ||||
| -rw-r--r-- | chaos-at-home/r3-0x10.yml | 3 |
4 files changed, 14 insertions, 8 deletions
diff --git a/chaos-at-home/ch-http-proxy.yml b/chaos-at-home/ch-http-proxy.yml index 67e3521a..24fd6f92 100644 --- a/chaos-at-home/ch-http-proxy.yml +++ b/chaos-at-home/ch-http-proxy.yml @@ -47,7 +47,8 @@ default: yes name: web template: generic - acme: yes + tls: + certificate_provider: acmetool hostnames: - web.chaos-at-home.org locations: @@ -112,7 +113,8 @@ nginx_vhost: name: passwd template: generic - acme: yes + tls: + certificate_provider: acmetool hostnames: - passwd.chaos-at-home.org locations: @@ -179,7 +181,8 @@ nginx_vhost: name: webmail template: generic - acme: yes + tls: + certificate_provider: acmetool hostnames: - webmail.chaos-at-home.org locations: @@ -204,7 +207,8 @@ nginx_vhost: name: webdav template: generic - acme: yes + tls: + certificate_provider: acmetool hostnames: - webdav.chaos-at-home.org locations: @@ -228,7 +232,6 @@ vars: nginx_vhost: name: imap - acme: no content: | server { listen 80; diff --git a/chaos-at-home/ch-mimas.yml b/chaos-at-home/ch-mimas.yml index 2743644c..d486023b 100644 --- a/chaos-at-home/ch-mimas.yml +++ b/chaos-at-home/ch-mimas.yml @@ -44,7 +44,8 @@ nginx_vhost: name: pub template: generic - acme: yes + tls: + certificate_provider: "{{ acme_client }}" hostnames: - pub.chaos-at-home.org locations: diff --git a/chaos-at-home/ch-pan.yml b/chaos-at-home/ch-pan.yml index 56a4f30a..eea3f287 100644 --- a/chaos-at-home/ch-pan.yml +++ b/chaos-at-home/ch-pan.yml @@ -43,7 +43,8 @@ template: generic hostnames: - dyn.schaaas.at - acme: yes + tls: + certificate_provider: "{{ acme_client }}" extra_directives: | access_log /var/log/nginx/dyn-schaaas_access.log; error_log /var/log/nginx/dyn-schaaas_error.log; diff --git a/chaos-at-home/r3-0x10.yml b/chaos-at-home/r3-0x10.yml index c613f373..5e30abec 100644 --- a/chaos-at-home/r3-0x10.yml +++ b/chaos-at-home/r3-0x10.yml @@ -33,7 +33,8 @@ default: yes name: 0x10 template: generic - acme: yes + tls: + certificate_provider: "{{ acme_client }}" hostnames: - 0x10.r3.at - 0x10.realraum.at |