From 647f112c2b6c926a808cf9285db5a7c33750b59c Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sat, 6 Jun 2020 13:56:58 +0200 Subject: [PATCH] nginx/server: Extracted special pre directives into configurable vars --- roles/nginx/server/defaults/main.yml | 11 +++++++++++ roles/nginx/server/templates/server.conf | 8 +++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/roles/nginx/server/defaults/main.yml b/roles/nginx/server/defaults/main.yml index 7e21290..15fbfaa 100644 --- a/roles/nginx/server/defaults/main.yml +++ b/roles/nginx/server/defaults/main.yml @@ -2,3 +2,14 @@ # domain: example.com # directives: "server { … }" + +listen_directives: | + listen 443 ssl http2; + listen [::]:443 ssl http2; + +server_name_directives: | + server_name {{ domain }}; + +certificates_directives: | + ssl_certificate {{ acme_certificate_location }}; + ssl_certificate_key {{ acme_key_location }}; diff --git a/roles/nginx/server/templates/server.conf b/roles/nginx/server/templates/server.conf index 4f3cf30..1f57278 100644 --- a/roles/nginx/server/templates/server.conf +++ b/roles/nginx/server/templates/server.conf @@ -1,10 +1,8 @@ server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name {{ domain }}; + {{ listen_directives | indent(width=2) }} + {{ server_name_directives | indent(width=2) }} - ssl_certificate {{ acme_certificate_location }}; - ssl_certificate_key {{ acme_key_location }}; + {{ certificates_directives | indent(width=2) }} include {{ nginx_snippets_directory }}/https; include {{ nginx_snippets_directory }}/global;