summaryrefslogtreecommitdiff
path: root/nginx
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2020-04-01 09:47:05 -0400
committerDaniel Micay <danielmicay@gmail.com>2020-04-01 09:50:35 -0400
commit4590363b85224d970c6b4d9dafd5febe61e91251 (patch)
treeeced18b20194b7b1d71178856145afd06a9271b8 /nginx
parent3bb6e98151eb2baa23cee0eedaa105afa2176028 (diff)
reorganize nginx configuration
Diffstat (limited to 'nginx')
-rw-r--r--nginx/server.conf16
1 files changed, 8 insertions, 8 deletions
diff --git a/nginx/server.conf b/nginx/server.conf
index 8f58dcc1..7e5430a2 100644
--- a/nginx/server.conf
+++ b/nginx/server.conf
@@ -15,8 +15,6 @@ server {
server_name connectivitycheck.grapheneos.org www.grapheneos.org grapheneos.org;
- root /var/www/html;
-
ssl_certificate /etc/letsencrypt/live/grapheneos.org/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/grapheneos.org/privkey.pem;
include /etc/letsencrypt/options-ssl-nginx.conf;
@@ -26,6 +24,12 @@ server {
ssl_stapling on;
ssl_stapling_verify on;
+ root /var/www/html;
+
+ charset utf-8;
+ include /etc/nginx/snippets/security-headers.conf;
+ gzip_static on;
+
if ($host != "grapheneos.org") {
return 301 https://grapheneos.org$request_uri;
}
@@ -91,10 +95,6 @@ server {
add_header Cache-Control "public, max-age=31536000";
gzip_static off;
}
-
- charset utf-8;
- include /etc/nginx/snippets/security-headers.conf;
- gzip_static on;
}
server {
@@ -114,8 +114,6 @@ server {
server_name mta-sts.grapheneos.org;
- root /var/www/mta-sts;
-
ssl_certificate /etc/letsencrypt/live/grapheneos.org/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/grapheneos.org/privkey.pem;
include /etc/letsencrypt/options-ssl-nginx.conf;
@@ -125,5 +123,7 @@ server {
ssl_stapling on;
ssl_stapling_verify on;
+ root /var/www/mta-sts;
+
include /etc/nginx/snippets/security-headers.conf;
}