simplified config

celogeek · Mar 17, 2019 · 485326b · 485326b
1 parent 5787dda
commit 485326b
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 89 deletions.
diff --git a/files/etc/nginx/conf.d/all.conf b/files/etc/nginx/conf.d/all.conf
@@ -2,4 +2,3 @@ include conf.d/opti.conf;
 include conf.d/ssl.conf;
 include conf.d/gzip.conf;
 include conf.d/realip.conf;
-#include conf.d/geoip2.conf;
diff --git a/files/etc/nginx/conf.d/default_site b/files/etc/nginx/conf.d/default_site
diff --git a/files/etc/nginx/conf.d/fastcgi_params b/files/etc/nginx/conf.d/fastcgi_params
diff --git a/files/etc/nginx/conf.d/geoip2.conf b/files/etc/nginx/conf.d/geoip2.conf
diff --git a/files/etc/nginx/conf.d/listen_both.conf b/files/etc/nginx/conf.d/listen_both.conf
diff --git a/files/etc/nginx/conf.d/listen_both_default.conf b/files/etc/nginx/conf.d/listen_both_default.conf
diff --git a/files/etc/nginx/conf.d/listen_http.conf b/files/etc/nginx/conf.d/listen_http.conf
@@ -1,2 +1,2 @@
 listen 80;
-listen [::]:80;
+listen [::]:80 ipv6only=on;
diff --git a/files/etc/nginx/conf.d/listen_http_default.conf b/files/etc/nginx/conf.d/listen_http_default.conf
diff --git a/files/etc/nginx/conf.d/listen_https.conf b/files/etc/nginx/conf.d/listen_https.conf
@@ -1,4 +1,4 @@
 listen 443 ssl http2;
-listen [::]:443 ssl http2;
+listen [::]:443 ssl ipv6only=on http2;
 
 add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; ";
diff --git a/files/etc/nginx/conf.d/listen_https_default.conf b/files/etc/nginx/conf.d/listen_https_default.conf
diff --git a/files/etc/nginx/conf.d/php.conf b/files/etc/nginx/conf.d/php.conf
diff --git a/files/etc/nginx/conf.d/ssl_checker.conf b/files/etc/nginx/conf.d/ssl_checker.conf
diff --git a/files/etc/nginx/nginx.conf b/files/etc/nginx/nginx.conf
@@ -20,7 +20,30 @@ http {
     access_log /var/log/nginx/access.log main;
     error_log /var/log/nginx/error.log;
 
-    include conf.d/default_site;
+    server {
+        include conf.d/listen_http.conf
+        server_name _;
+
+        location ^~ /.well-known/acme-challenge/ {
+        root /var/www/;
+        allow all;
+        }
+
+        location / {
+            return 301 https://$host$request_uri;
+        }
+    }
+
+    server {
+        include conf.d/listen_https.conf
+        server_name _;
+
+        ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
+        ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+
+        return 404;
+    }
+
     include sites/*;
 }
 

diff --git a/files/etc/nginx/conf.d/proxy_params → files/etc/nginx/proxy_params b/files/etc/nginx/conf.d/proxy_params → files/etc/nginx/proxy_params