From 646893bf95224ff288099e65ed0db7a1230d958c Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Jan 21 2018 16:00:53 +0000
Subject: Merge branch 'nginx_progress' into 'production'


add progress.o.o nginx config

See merge request infra/salt!162
---

diff --git a/pillar/id/redmine_infra_opensuse_org.sls b/pillar/id/redmine_infra_opensuse_org.sls
index 9399a2f..7320858 100644
--- a/pillar/id/redmine_infra_opensuse_org.sls
+++ b/pillar/id/redmine_infra_opensuse_org.sls
@@ -3,5 +3,7 @@ grains:
   country: de
   hostusage:
     - progress.o.o
+  roles:
+    - web_progress
   salt_cluster: opensuse
   virt_cluster: atreju
diff --git a/pillar/role/web_progress.sls b/pillar/role/web_progress.sls
new file mode 100644
index 0000000..f6612bf
--- /dev/null
+++ b/pillar/role/web_progress.sls
@@ -0,0 +1,30 @@
+include:
+  - role.common.nginx
+
+nginx:
+  ng:
+    servers:
+      managed:
+        progress.opensuse.org.conf:
+          config:
+            - upstream redmine:
+                - server:
+                    - unix:/srv/www/vhosts/redmine/tmp/sockets/redmine.socket
+                    - fail_timeout=0
+            - server:
+                - listen: 80
+                - server_tokens: 'off'
+                - set_real_ip_from: 192.168.47.4
+                - set_real_ip_from: 192.168.47.101
+                - set_real_ip_from: 192.168.47.102
+                - set_real_ip_from: 192.168.47.16
+                - set_real_ip_from: 172.16.42.3
+                - real_ip_header: X-Forwarded-For
+                # HSTS (ngx_http_headers_module is required) (15768000 seconds = 6 months)
+                - add_header: Strict-Transport-Security max-age=15768000
+                - location /:
+                    - try_files: $uri/index.html $uri.html $uri @cluster
+                - location @cluster:
+                    - proxy_pass http://redmine
+                - access_log: /var/log/nginx/redmine.access.log combined
+                - error_log: /var/log/nginx/redmine.error.log
diff --git a/salt/role/web_progress.sls b/salt/role/web_progress.sls
new file mode 100644
index 0000000..a5b1924
--- /dev/null
+++ b/salt/role/web_progress.sls
@@ -0,0 +1,2 @@
+include:
+  - profile.web.server.nginx