diff options
| -rw-r--r-- | roles/common-web/files/etc/nginx/conf.d/ssl (renamed from roles/common-web/files/etc/nginx/ssl/config) | 0 | ||||
| -rw-r--r-- | roles/common-web/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/git/files/etc/nginx/sites-available/git | 2 | ||||
| -rw-r--r-- | roles/lists/files/etc/nginx/sites-available/sympa | 2 | ||||
| -rw-r--r-- | roles/webmail/files/etc/nginx/sites-available/roundcube | 2 | ||||
| -rw-r--r-- | roles/wiki/files/etc/nginx/sites-available/website | 2 | ||||
| -rw-r--r-- | roles/wiki/files/etc/nginx/sites-available/wiki | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/roles/common-web/files/etc/nginx/ssl/config b/roles/common-web/files/etc/nginx/conf.d/ssl index 26a64f4..26a64f4 100644 --- a/roles/common-web/files/etc/nginx/ssl/config +++ b/roles/common-web/files/etc/nginx/conf.d/ssl diff --git a/roles/common-web/tasks/main.yml b/roles/common-web/tasks/main.yml index d2b2acd..1f06c13 100644 --- a/roles/common-web/tasks/main.yml +++ b/roles/common-web/tasks/main.yml @@ -36,9 +36,9 @@ notify: - Restart Nginx -- name: Copy SSL configuration - copy: src=etc/nginx/ssl/config - dest=/etc/nginx/ssl/config +- name: Copy SSL configuration snippet + copy: src=etc/nginx/conf.d/ssl + dest=/etc/nginx/conf.d/ssl owner=root group=root mode=0644 register: r2 diff --git a/roles/git/files/etc/nginx/sites-available/git b/roles/git/files/etc/nginx/sites-available/git index 112babb..c71dd7b 100644 --- a/roles/git/files/etc/nginx/sites-available/git +++ b/roles/git/files/etc/nginx/sites-available/git @@ -50,7 +50,7 @@ server { server_name git.fripost.org; - include ssl/config; + include conf.d/ssl; ssl_certificate /etc/nginx/ssl/git.fripost.org.pem; ssl_certificate_key /etc/nginx/ssl/git.fripost.org.key; diff --git a/roles/lists/files/etc/nginx/sites-available/sympa b/roles/lists/files/etc/nginx/sites-available/sympa index 77e9dc0..2dad552 100644 --- a/roles/lists/files/etc/nginx/sites-available/sympa +++ b/roles/lists/files/etc/nginx/sites-available/sympa @@ -20,7 +20,7 @@ server { access_log /var/log/nginx/lists.access.log; error_log /var/log/nginx/lists.error.log info; - include ssl/config; + include conf.d/ssl; ssl_certificate /etc/nginx/ssl/lists.fripost.org.pem; ssl_certificate_key /etc/nginx/ssl/lists.fripost.org.key; diff --git a/roles/webmail/files/etc/nginx/sites-available/roundcube b/roles/webmail/files/etc/nginx/sites-available/roundcube index 8251841..af1818b 100644 --- a/roles/webmail/files/etc/nginx/sites-available/roundcube +++ b/roles/webmail/files/etc/nginx/sites-available/roundcube @@ -19,7 +19,7 @@ server { server_name mail.fripost.org; root /var/lib/roundcube; - include ssl/config; + include conf.d/ssl; # include the intermediate certificate, see # - https://www.ssllabs.com/ssltest/analyze.html?d=mail.fripost.org # - http://nginx.org/en/docs/http/configuring_https_servers.html diff --git a/roles/wiki/files/etc/nginx/sites-available/website b/roles/wiki/files/etc/nginx/sites-available/website index ba8a34f..2a32212 100644 --- a/roles/wiki/files/etc/nginx/sites-available/website +++ b/roles/wiki/files/etc/nginx/sites-available/website @@ -18,7 +18,7 @@ server { server_name fripost.org; - include ssl/config; + include conf.d/ssl; # include the intermediate certificate, see # - https://www.ssllabs.com/ssltest/analyze.html?d=fripost.org # - http://nginx.org/en/docs/http/configuring_https_servers.html diff --git a/roles/wiki/files/etc/nginx/sites-available/wiki b/roles/wiki/files/etc/nginx/sites-available/wiki index 304ea1a..8951633 100644 --- a/roles/wiki/files/etc/nginx/sites-available/wiki +++ b/roles/wiki/files/etc/nginx/sites-available/wiki @@ -26,7 +26,7 @@ server { server_name wiki.fripost.org; - include ssl/config; + include conf.d/ssl; # include the intermediate certificate, see # - https://www.ssllabs.com/ssltest/analyze.html?d=wiki.fripost.org # - http://nginx.org/en/docs/http/configuring_https_servers.html |