From 75a5880d96818cae3bed945267e62c1d3927f2c1 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Thu, 30 May 2019 17:02:57 +0200
Subject: Update to nginx formula >1.0.0
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/remmy_io.sls | 85 +++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

(limited to 'nginx/remmy_io.sls')

diff --git a/nginx/remmy_io.sls b/nginx/remmy_io.sls
index d240e98..d8d36c6 100644
--- a/nginx/remmy_io.sls
+++ b/nginx/remmy_io.sls
@@ -1,60 +1,59 @@
 nginx:
-  ng:
-    servers:
-      managed:
-        remmy.io:
-          enabled: True
-          config:
-            - server:
-              - server_name: remmy.io
-              - listen: 80
-              - listen: '[::]:80'
+  servers:
+    managed:
+      remmy.io:
+        enabled: True
+        config:
+          - server:
+            - server_name: remmy.io
+            - listen: 80
+            - listen: '[::]:80'
 
-              - location /.well-known/acme-challenge:
-                - root: /srv/http
+            - location /.well-known/acme-challenge:
+              - root: /srv/http
 
-              - location /:
-                - return: '301 https://$server_name$request_uri'
+            - location /:
+              - return: '301 https://$server_name$request_uri'
 
 
-            - server:
-              - server_name: remmy.io
-              - listen: 443 ssl http2
-              - listen: '[::]:443 ssl http2'
+          - server:
+            - server_name: remmy.io
+            - listen: 443 ssl http2
+            - listen: '[::]:443 ssl http2'
 
-              - ssl: 'on'
-              - ssl_certificate: /etc/letsencrypt/live/remmy.io/fullchain.pem
-              - ssl_certificate_key: /etc/letsencrypt/live/remmy.io/privkey.pem
-              - ssl_dhparam: /etc/nginx/dhparam.pem
+            - ssl: 'on'
+            - ssl_certificate: /etc/letsencrypt/live/remmy.io/fullchain.pem
+            - ssl_certificate_key: /etc/letsencrypt/live/remmy.io/privkey.pem
+            - ssl_dhparam: /etc/nginx/dhparam.pem
 
-              - ssl_stapling: 'on'
-              - ssl_stapling_verify: 'on'
-              - ssl_trusted_certificate: /etc/letsencrypt/live/remmy.io/fullchain.pem
+            - ssl_stapling: 'on'
+            - ssl_stapling_verify: 'on'
+            - ssl_trusted_certificate: /etc/letsencrypt/live/remmy.io/fullchain.pem
 
-              # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security
-              - add_header: 'Strict-Transport-Security "max-age=31536000"'
+            # 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 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
+            # 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"'
+            # 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"'
+            # http://www.gnuterrypratchett.com/
+            - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"'
 
-              - error_log: /var/log/nginx/remmy_io.error.log
+            - error_log: /var/log/nginx/remmy_io.error.log
 
-              - root: /home/kyrias/public_html/
-              - index: index.html
-              - autoindex: 'on'
-              - try_files: $uri $uri.html $uri/ =404
+            - root: /home/kyrias/public_html/
+            - index: index.html
+            - autoindex: 'on'
+            - try_files: $uri $uri.html $uri/ =404
 
-              - location ~ \.(js|css|png):
-                - expires: modified +7d
+            - location ~ \.(js|css|png):
+              - expires: modified +7d
 
 # vim: ft=yaml et:
-- 
cgit v1.2.3-54-g00ecf