Proxy redirects for bodhi2.

playbooks/include/proxies-redirects.yml

@@ -51,23 +51,20 @@
     name: 00-bodhi2-cutover-users
     website: admin.fedoraproject.org
     regex: /updates/user/(.*)$
-    target: https://bodhi.stg.fedoraproject.org/users/$1
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/users/$1
 
   - role: httpd/redirectmatch
     name: 01-bodhi2-cutover-comments-list
     website: admin.fedoraproject.org
     regex: /updates/comments$
-    target: https://bodhi.stg.fedoraproject.org/comments/
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/comments/
 
   # This one is sub-optimal, but we have no way to map /mine to /$username
   - role: httpd/redirectmatch
     name: 02-bodhi2-mine-fallback
     website: admin.fedoraproject.org
     regex: /updates/mine$
-    target: https://bodhi.stg.fedoraproject.org/
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/
 
   # This is similar to /mine.  Ideally, we would redirect to
   # /overrides/?user=$USERNAME, but we can't get that username afaik.
@@ -75,43 +72,37 @@
     name: 03-bodhi2-cutover-overrides-list
     website: admin.fedoraproject.org
     regex: /updates/override/list$
-    target: https://bodhi.stg.fedoraproject.org/overrides/
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/overrides/
 
   - role: httpd/redirectmatch
     name: 04-bodhi2-new-update-gotcha
     website: admin.fedoraproject.org
     regex: /updates/new/*$
-    target: https://bodhi.stg.fedoraproject.org/updates/new
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/updates/new
 
   - role: httpd/redirectmatch
     name: 05-bodhi2-api-version
     website: admin.fedoraproject.org
     regex: /updates/api_version$
-    target: https://bodhi.stg.fedoraproject.org/api_version
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/api_version
 
   - role: httpd/redirectmatch
     name: 06-bodhi2-login
     website: admin.fedoraproject.org
     regex: /updates/login$
-    target: https://bodhi.stg.fedoraproject.org/login
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/login
 
   - role: httpd/redirectmatch
     name: 07-bodhi2-logout
     website: admin.fedoraproject.org
     regex: /updates/logout$
-    target: https://bodhi.stg.fedoraproject.org/logout
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/logout
 
   - role: httpd/redirectmatch
     name: 08-bodhi2-rss
     website: admin.fedoraproject.org
     regex: /updates/rss/rss2\.0
-    target: https://bodhi.stg.fedoraproject.org/updates
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/updates
 
   - role: httpd/redirectmatch
     name: 89-bodhi2-icon
@@ -123,8 +114,7 @@
     name: 90-bodhi2-cutover-updates
     website: admin.fedoraproject.org
     regex: /updates/(.*)$
-    target: https://bodhi.stg.fedoraproject.org/updates/$1
-    when: env == 'staging'
+    target: https://bodhi.fedoraproject.org/updates/$1
 
   - role: httpd/redirect
     name: get-fedora

playbooks/include/proxies-reverseproxy.yml

@@ -231,14 +231,6 @@
     localpath: /pkgdb
     proxyurl: "{{ varnish_url }}"
 
-  - role: httpd/reverseproxy
-    website: admin.fedoraproject.org
-    destname: bodhi
-    remotepath: /updates
-    localpath: /updates
-    proxyurl: http://localhost:10009
-    when: env != "staging"
-
   - role: httpd/reverseproxy
     website: bodhi.fedoraproject.org
     destname: bodhi