From c08292040f51f8ebc67c0c75c7bc83980a914929 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Tue, 10 Jan 2017 16:38:47 +0000
Subject: Remove gerrit nginx conf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
 theos/init.sls                      |  3 ++-
 theos/nginx/gerrit_kyriasis_com.sls | 45 -------------------------------------
 2 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 theos/nginx/gerrit_kyriasis_com.sls

diff --git a/theos/init.sls b/theos/init.sls
index 56f2ba5..6970624 100644
--- a/theos/init.sls
+++ b/theos/init.sls
@@ -2,7 +2,8 @@ include:
   - theos.nginx.theos_kyriasis_com
   - theos.nginx.xan_kyriasis_com
   - theos.nginx.git_kyriasis_com
-  - theos.nginx.gerrit_kyriasis_com
+  - theos.nginx.matrix_kyriasis_com
+  - theos.nginx.riot_kyriasis_com
   - theos.opensmtpd
 
 # vim: set ft=yaml et:
diff --git a/theos/nginx/gerrit_kyriasis_com.sls b/theos/nginx/gerrit_kyriasis_com.sls
deleted file mode 100644
index 4504ab4..0000000
--- a/theos/nginx/gerrit_kyriasis_com.sls
+++ /dev/null
@@ -1,45 +0,0 @@
-nginx:
-  ng:
-    servers:
-      managed:
-        gerrit.kyriasis.com:
-          enabled: True
-          config:
-            - server:
-              - server_name: gerrit.kyriasis.com
-              - listen: 80
-              - listen: '[::]:80'
-              - return: '301 https://$server_name$request_uri'
-
-            - server:
-              - server_name: gerrit.kyriasis.com
-              - listen: 443 ssl http2
-              - listen: '[::]:443 ssl http2'
-
-              - ssl: 'on'
-              - ssl_certificate: /etc/letsencrypt/live/gerrit.kyriasis.com/fullchain.pem
-              - ssl_certificate_key: /etc/letsencrypt/live/gerrit.kyriasis.com/privkey.pem
-              - ssl_dhparam: /etc/nginx/dhparam.pem
-
-              - ssl_stapling: 'on'
-              - ssl_stapling_verify: 'on'
-              - ssl_trusted_certificate: /etc/letsencrypt/live/gerrit.kyriasis.com/fullchain.pem
-
-              # 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"'
-
-              - root: /srv/http/
-
-              - location /:
-                - proxy_pass: http://127.0.0.1:8081
-                - proxy_set_header: X-Forwarded-For $remote_addr
-                - proxy_set_header: Host $host
-
-              - location /.well-known:
-                - root: /srv/http/
-
-# vim: ft=yaml et:
-- 
cgit v1.2.3-54-g00ecf