From 4e27b704267d494bebfb2845cfe2b20677482c2d Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 20 2019 20:39:34 +0000
Subject: Merge branch 'cboltz-tsp' into 'production'


add web_tsp role with (very) basic setup

See merge request infra/salt!239
---

diff --git a/pillar/id/tsp_infra_opensuse_org.sls b/pillar/id/tsp_infra_opensuse_org.sls
index af90fc4..f901d47 100644
--- a/pillar/id/tsp_infra_opensuse_org.sls
+++ b/pillar/id/tsp_infra_opensuse_org.sls
@@ -3,5 +3,7 @@ grains:
   country: de
   hostusage:
     - future travel support program webapp replacement
+  roles:
+    - web_tsp
   salt_cluster: opensuse
   virt_cluster: atreju
diff --git a/pillar/role/web_tsp.sls b/pillar/role/web_tsp.sls
new file mode 100644
index 0000000..579e8fa
--- /dev/null
+++ b/pillar/role/web_tsp.sls
@@ -0,0 +1,23 @@
+include:
+  - role.common.nginx
+
+nginx:
+  ng:
+    servers:
+      managed:
+        tsp.opensuse.org.conf:
+          config:
+            - server:
+                - listen:
+                    - 80
+                    - default_server
+                - server_name: tsp.opensuse.org
+                - root: /srv/www/htdocs
+                - location /:
+                    - proxy_pass: http://127.0.0.1:3000
+                - error_page: 500 502 503 504 /50x.html
+                - location = /50x.html:
+                    - root: /srv/www/htdocs
+                - access_log: /var/log/nginx/tsp.access.log combined
+                - error_log: /var/log/nginx/tsp.error.log
+          enabled: True
diff --git a/salt/profile/tsp/init.sls b/salt/profile/tsp/init.sls
new file mode 100644
index 0000000..d211211
--- /dev/null
+++ b/salt/profile/tsp/init.sls
@@ -0,0 +1,6 @@
+tsp_packages:
+  pkg.installed:
+    - pkgs:
+      - git
+      - ruby
+      - ruby2.5-rubygem-bundler
diff --git a/salt/role/web_tsp.sls b/salt/role/web_tsp.sls
new file mode 100644
index 0000000..20aed0b
--- /dev/null
+++ b/salt/role/web_tsp.sls
@@ -0,0 +1,3 @@
+include:
+  - profile.web.server.nginx
+  - profile.tsp