From 6ab5939e7713ff168f63019d45b198b03147317b Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 21 2020 21:07:37 +0000
Subject: Merge branch 'cboltz-move-www' into 'production'


host www.o.o on narwal* (except /openid/)

See merge request infra/salt!395
---

diff --git a/pillar/role/static_master.sls b/pillar/role/static_master.sls
index b59600e..96e0b67 100644
--- a/pillar/role/static_master.sls
+++ b/pillar/role/static_master.sls
@@ -40,6 +40,9 @@ profile:
         repo: https://github.com/openSUSE/studioexpress-landing.git
       lizards.opensuse.org:
         repo: https://github.com/openSUSE/lizards.git
+      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
     server_list:
       - narwal5.infra.opensuse.org
       - narwal6.infra.opensuse.org
diff --git a/pillar/role/web_static.sls b/pillar/role/web_static.sls
index dc643d2..f51f64b 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'] %}
+{% set websites = ['html5test', 'people', 'shop', 'static', 'studioexpress', 'lizards', 'www'] %}
 
 include:
   - role.common.nginx