From 3414da9d17006a454b635923dc95e31786344f51 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 18 May 2016 20:05:24 +0000
Subject: [PATCH] add lists.fedorahosted.org into the mix

---
 playbooks/include/proxies-reverseproxy.yml | 22 ++++++++--------------
 playbooks/include/proxies-websites.yml     |  8 ++++++++
 roles/varnish/templates/proxy.vcl.j2       |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index f063ad2134..48e67b0738 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -51,20 +51,6 @@
     remotepath: /nagios-external
     proxyurl: http://noc02
 
-#  - role: httpd/reverseproxy
-#    website: admin.fedoraproject.org
-#    destname: mailman
-#    localpath: /mailman
-#    remotepath: /mailman
-#    proxyurl: http://collab03.fedoraproject.org
-
-  - role: httpd/reverseproxy
-    website: admin.fedoraproject.org
-    destname: mailman-icons
-    localpath: /icons
-    remotepath: /icons
-    proxyurl: http://collab03.fedoraproject.org
-
   - role: httpd/reverseproxy
     website: lists.fedoraproject.org
     destname: mailman3
@@ -73,6 +59,14 @@
     header_scheme: true
     proxyurl: "{{ varnish_url }}"
 
+  - role: httpd/reverseproxy
+    website: lists.fedorahosted.org
+    destname: mailman3
+    localpath: /
+    remotepath: /
+    header_scheme: true
+    proxyurl: "{{ varnish_url }}"
+
   # The place for the raw originals
   - role: httpd/reverseproxy
     website: meetbot-raw.fedoraproject.org
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 2c2a90075f..18d62fa2d4 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -525,6 +525,14 @@
     SSLCertificateChainFile: wildcard-2014.stg.fedoraproject.org.intermediate.cert
     cert_name: "{{wildcard_cert_name}}"
 
+  - role: httpd/website
+    name: lists.fedorahosted.org
+    server_aliases: [lists.stg.fedorahosted.org]
+    sslonly: true
+    # Set this explicitly to stg here.. as per the original puppet config.
+    SSLCertificateChainFile: wildcard-2014.fedorahosted.org.intermediate.cert
+    cert_name: wildcard-2014.fedorahosted.org
+
   - role: httpd/website
     name: id.fedoraproject.org
     server_aliases:
diff --git a/roles/varnish/templates/proxy.vcl.j2 b/roles/varnish/templates/proxy.vcl.j2
index 440f32ca85..86ccd2fc31 100644
--- a/roles/varnish/templates/proxy.vcl.j2
+++ b/roles/varnish/templates/proxy.vcl.j2
@@ -286,7 +286,7 @@ sub vcl_recv {
             }
         }
     }
-    if (req.http.X-Forwarded-Server ~ "^lists.fedoraproject.org" || req.http.X-Forwarded-Server ~ "^lists.stg.fedoraproject.org") {
+    if (req.http.X-Forwarded-Server ~ "^lists.fedoraproject.org" || req.http.X-Forwarded-Server ~ "^lists.stg.fedoraproject.org" || req.http.X-Forwarded-Server ~ "^lists.fedorahosted.org" || req.http.X-Forwarded-Server ~ "^lists.stg.fedorahosted.org" ) {
         set req.backend_hint = mailman;
     }
     if (req.http.X-Forwarded-Server ~ "^apps.fedoraproject.org" || req.http.X-Forwarded-Server ~ "^apps.stg.fedoraproject.org") {