From d76087ab8449ffbd844d5a7fde1dad878088ac33 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Wed, 27 May 2020 00:59:50 +0200
Subject: Fix gallery-bypass to use separate cert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
 nginx/gallery_remmy_io.sls | 56 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

(limited to 'nginx')

diff --git a/nginx/gallery_remmy_io.sls b/nginx/gallery_remmy_io.sls
index a2752ef..41e15b6 100644
--- a/nginx/gallery_remmy_io.sls
+++ b/nginx/gallery_remmy_io.sls
@@ -5,7 +5,7 @@ nginx:
         enabled: True
         config:
           - server:
-            - server_name: gallery.remmy.io gallery-bypass.remmy.io
+            - server_name: gallery.remmy.io
             - listen: 80
             - listen: '[::]:80'
 
@@ -17,7 +17,7 @@ nginx:
 
 
           - server:
-            - server_name: gallery.remmy.io gallery-bypass.remmy.io
+            - server_name: gallery.remmy.io
             - listen: 443 ssl http2
             - listen: '[::]:443 ssl http2'
 
@@ -53,4 +53,56 @@ nginx:
               - proxy_http_version: '1.1'
               - proxy_pass: http://127.0.0.1:8186
 
+      gallery-bypass.remmy.io:
+        enabled: True
+        config:
+          - server:
+            - server_name: gallery-bypass.remmy.io
+            - listen: 80
+            - listen: '[::]:80'
+
+            - location /.well-known/acme-challenge:
+              - root: /srv/http
+
+            - location /:
+              - return: '301 https://$server_name$request_uri'
+
+
+          - server:
+            - server_name: gallery-bypass.remmy.io
+            - listen: 443 ssl http2
+            - listen: '[::]:443 ssl http2'
+
+            - ssl_certificate: /etc/letsencrypt/live/gallery-bypass.remmy.io/fullchain.pem
+            - ssl_certificate_key: /etc/letsencrypt/live/gallery-bypass.remmy.io/privkey.pem
+            - ssl_dhparam: /etc/nginx/dhparam.pem
+
+            - ssl_stapling: 'on'
+            - ssl_stapling_verify: 'on'
+            - ssl_trusted_certificate: /etc/letsencrypt/live/gallery-bypass.remmy.io/fullchain.pem
+
+            # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security
+            - add_header: 'Strict-Transport-Security "max-age=31536000"'
+
+            # Tell browsers not to render the page inside a frame, and avoid clickjacking.
+            - add_header: X-Frame-Options SAMEORIGIN
+
+            # Tell browsers to not try to auto-detect the Content-Type.
+            - add_header: X-Content-Type-Options nosniff
+
+            # Enable the Cross-site scripting filter in most recent browsers.
+            # Normally enabled by default, but enable it anyway if user has disabled it.
+            - add_header: 'X-XSS-Protection "1; mode=block"'
+
+            # http://www.gnuterrypratchett.com/
+            - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"'
+
+            - error_log: /var/log/nginx/gallery-bypass.error.log
+
+            - try_files: $uri $uri.html $uri/ =404
+
+            - location /:
+              - proxy_http_version: '1.1'
+              - proxy_pass: http://127.0.0.1:8186
+
 # vim: ft=yaml et:
-- 
cgit v1.2.3-70-g09d2