summaryrefslogtreecommitdiffstats
path: root/roles/wiki/files/etc/nginx/sites-available/website
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2015-12-09 17:21:06 +0100
committerGuilhem Moulin <guilhem@fripost.org>2015-12-09 17:21:06 +0100
commit2e67b6809d3b44da2e1e6ee6a974f10a3844964f (patch)
tree5e01116da2e0108dc53fe18a2d53d3a8a45c9289 /roles/wiki/files/etc/nginx/sites-available/website
parent32dbd35ec0e3e96a1a6ef569a641dc3c9e6a91f7 (diff)
ngnix: mv ssl/config conf.d/ssl
Diffstat (limited to 'roles/wiki/files/etc/nginx/sites-available/website')
-rw-r--r--roles/wiki/files/etc/nginx/sites-available/website2
1 files changed, 1 insertions, 1 deletions
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
@@ -1,41 +1,41 @@
server {
listen 80;
listen [::]:80;
server_name fripost.org;
server_name www.fripost.org;
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log info;
return 301 https://fripost.org$request_uri;
}
server {
listen 443;
listen [::]:443;
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
ssl_certificate /etc/nginx/ssl/fripost.org.chained.pem;
ssl_certificate_key /etc/nginx/ssl/fripost.org.key;
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log info;
location / {
try_files $uri $uri/ =404;
index index.html;
root /var/lib/ikiwiki/public_html/fripost-wiki/website;
}
location /static/ {
alias /var/lib/ikiwiki/public_html/fripost-wiki/static/;
expires 30d;
}
location /material/ {
alias /var/www/fripost.org/material/;