summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2015-12-15 02:15:50 +0100
committerGuilhem Moulin <guilhem@fripost.org>2015-12-15 02:15:55 +0100
commitb483d2050147115dce151d669c537bcb1776164e (patch)
tree33261df9053cef2830b8ceb09b202b9bf3d30919
parentea7372eb8a2fa66b08ec37b030a098998e0aa47d (diff)
nginx: s/conf.d/include.d/
-rw-r--r--roles/common-web/files/etc/nginx/include.d/ssl (renamed from roles/common-web/files/etc/nginx/conf.d/ssl)0
-rw-r--r--roles/common-web/tasks/main.yml4
-rw-r--r--roles/git/files/etc/nginx/sites-available/git2
-rw-r--r--roles/lists/files/etc/nginx/sites-available/sympa2
-rw-r--r--roles/webmail/files/etc/nginx/sites-available/roundcube2
-rw-r--r--roles/wiki/files/etc/nginx/sites-available/website2
-rw-r--r--roles/wiki/files/etc/nginx/sites-available/wiki2
7 files changed, 7 insertions, 7 deletions
diff --git a/roles/common-web/files/etc/nginx/conf.d/ssl b/roles/common-web/files/etc/nginx/include.d/ssl
index 26a64f4..26a64f4 100644
--- a/roles/common-web/files/etc/nginx/conf.d/ssl
+++ b/roles/common-web/files/etc/nginx/include.d/ssl
diff --git a/roles/common-web/tasks/main.yml b/roles/common-web/tasks/main.yml
index 1f06c13..f55770d 100644
--- a/roles/common-web/tasks/main.yml
+++ b/roles/common-web/tasks/main.yml
@@ -37,8 +37,8 @@
- Restart Nginx
- name: Copy SSL configuration snippet
- copy: src=etc/nginx/conf.d/ssl
- dest=/etc/nginx/conf.d/ssl
+ copy: src=etc/nginx/include.d/ssl
+ dest=/etc/nginx/include.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 c71dd7b..333da02 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 conf.d/ssl;
+ include include.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 146f1a2..3f2dce4 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 conf.d/ssl;
+ include include.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 76e07fe..fe67615 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 conf.d/ssl;
+ include include.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 2a32212..7899f05 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 conf.d/ssl;
+ include include.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 8951633..a12b017 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 conf.d/ssl;
+ include include.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