diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2015-12-20 13:59:39 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-12-20 13:59:39 +0100 |
| commit | 01e59771866559cc13a58800282617d04cb286a6 (patch) | |
| tree | a1772ca3ce7bde38d1c96a4855db504b6ab8ec96 /roles/wiki | |
| parent | 74943c88f1a0de34ca593dafe5b0785c7ee7a95e (diff) | |
nginx: Move include.d/* to snippets/.
Diffstat (limited to 'roles/wiki')
| -rw-r--r-- | roles/wiki/files/etc/nginx/sites-available/website | 9 | ||||
| -rw-r--r-- | roles/wiki/files/etc/nginx/sites-available/wiki | 11 |
2 files changed, 7 insertions, 13 deletions
diff --git a/roles/wiki/files/etc/nginx/sites-available/website b/roles/wiki/files/etc/nginx/sites-available/website index 7899f05..3e32158 100644 --- a/roles/wiki/files/etc/nginx/sites-available/website +++ b/roles/wiki/files/etc/nginx/sites-available/website @@ -18,12 +18,9 @@ server { server_name fripost.org; - 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 - ssl_certificate /etc/nginx/ssl/fripost.org.chained.pem; - ssl_certificate_key /etc/nginx/ssl/fripost.org.key; + include snippets/ssl.conf; + ssl_certificate /etc/nginx/ssl/www.fripost.org.chained.pem; + ssl_certificate_key /etc/nginx/ssl/www.fripost.org.key; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log info; diff --git a/roles/wiki/files/etc/nginx/sites-available/wiki b/roles/wiki/files/etc/nginx/sites-available/wiki index a12b017..3777b87 100644 --- a/roles/wiki/files/etc/nginx/sites-available/wiki +++ b/roles/wiki/files/etc/nginx/sites-available/wiki @@ -26,12 +26,9 @@ server { server_name wiki.fripost.org; - 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 - ssl_certificate /etc/nginx/ssl/fripost.org.chained.pem; - ssl_certificate_key /etc/nginx/ssl/fripost.org.key; + include snippets/ssl.conf; + ssl_certificate /etc/nginx/ssl/www.fripost.org.chained.pem; + ssl_certificate_key /etc/nginx/ssl/www.fripost.org.key; access_log /var/log/nginx/wiki.access.log; error_log /var/log/nginx/wiki.error.log info; @@ -47,7 +44,7 @@ server { fastcgi_param DOCUMENT_ROOT /var/lib/ikiwiki/public_html/fripost-wiki; fastcgi_param SCRIPT_FILENAME /var/lib/ikiwiki/public_html/ikiwiki.cgi; fastcgi_index ikiwiki.cgi; - include fastcgi/params; + include snippets/fastcgi.conf; fastcgi_pass unix:/var/run/fcgiwrap.socket; gzip off; } |