From 73ee8d01e766e095f112c89ad990829c421d0211 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Nov 03 2022 23:18:26 +0000
Subject: Merge branch 'hellcp/static-community' into 'production'


Create community on static

See merge request infra/salt!591
---

diff --git a/pillar/role/static_master.sls b/pillar/role/static_master.sls
index 376e678..1a176c0 100644
--- a/pillar/role/static_master.sls
+++ b/pillar/role/static_master.sls
@@ -40,6 +40,12 @@ profile:
       www.opensuse.org:
         repo: https://github.com/openSUSE/landing-page.git
         # www.o.o/openid/ is not handled by narwal*, haproxy forwards /openid/ to a different server
+      community.opensuse.org/ebooks:
+        repo: https://github.com/openSUSE/ebooks-archives.git
+        branch: main
+      community.opensuse.org/meetings:
+        repo: https://github.com/openSUSE/meetings-archives.git
+        branch: main
     server_list:
       - narwal4.infra.opensuse.org
       - narwal5.infra.opensuse.org
diff --git a/pillar/role/web_static.sls b/pillar/role/web_static.sls
index b8bcc52..d9c1f8d 100644
--- a/pillar/role/web_static.sls
+++ b/pillar/role/web_static.sls
@@ -1,4 +1,4 @@
-{% set websites = ['html5test', 'people', 'shop', 'static', 'studioexpress', 'lizards', 'www'] %}
+{% set websites = ['html5test', 'people', 'shop', 'static', 'studioexpress', 'lizards', 'www', 'community'] %}
 
 include:
   - role.common.nginx
@@ -40,10 +40,15 @@ nginx:
                     - return: 404
                 - location ~ /\.git:
                     - return: 404
+                {% if website == 'community' %}
+                - location /:
+                    - return: 301 https://www.opensuse.org/
+                {% else %}
                 - location /:
                     - index:
                         - index.html
                         - index.htm
+                {% endif %}
                 - location ~* \.(?:ttf|otf|eot|woff)$:
                     - add_header: Access-Control-Allow-Origin "*"
                 {% if website == 'static' %}