diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2 index d7cf03dbdf7962bcc08f976092c617c631e4d853..67b08e2f03cb227eecb6b2d359fbb8e42d9dc701 100644 --- a/roles/nginx/templates/nginx.conf.j2 +++ b/roles/nginx/templates/nginx.conf.j2 @@ -17,5 +17,7 @@ http { access_log /var/log/nginx/default/access.log; error_log /var/log/nginx/default/error.log; + include snippets/sslsettings.conf; + include nginx.d/*.conf; } diff --git a/roles/planet/templates/nginx.d.conf.j2 b/roles/planet/templates/nginx.d.conf.j2 index d388a912aea7e892a791cd4eaec633600d78ad80..2e2d841a29f4d78bf49d38d9ab028b01263465b1 100644 --- a/roles/planet/templates/nginx.d.conf.j2 +++ b/roles/planet/templates/nginx.d.conf.j2 @@ -24,7 +24,6 @@ server { ssl_certificate /etc/letsencrypt/live/{{ planet_domain }}/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/{{ planet_domain }}/privkey.pem; ssl_trusted_certificate /etc/letsencrypt/live/{{ planet_domain }}/chain.pem; - include snippets/sslsettings.conf; root {{ planet_dir }}/archplanet/output; diff --git a/roles/sources/templates/nginx.d.conf.j2 b/roles/sources/templates/nginx.d.conf.j2 index 3738d694adf37738600f72c516b2dccfc94b09c2..e596c886924f85c8ffa31445e5237e27044e8f28 100644 --- a/roles/sources/templates/nginx.d.conf.j2 +++ b/roles/sources/templates/nginx.d.conf.j2 @@ -24,7 +24,6 @@ server { ssl_certificate /etc/letsencrypt/live/{{ sources_domain }}/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/{{ sources_domain }}/privkey.pem; ssl_trusted_certificate /etc/letsencrypt/live/{{ sources_domain }}/chain.pem; - include snippets/sslsettings.conf; root {{ sources_dir }};