diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 12f573075b..5741cc6013 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -237,12 +237,13 @@ remotepath: /updates localpath: /updates proxyurl: http://localhost:10009 + when: env != "staging" - role: httpd/reverseproxy website: admin.fedoraproject.org destname: bodhi2 remotepath: / - localpath: /bodhi2 + localpath: /updates proxyurl: http://localhost:10010 when: env == "staging" diff --git a/roles/bodhi2/base/templates/staging.ini.j2 b/roles/bodhi2/base/templates/staging.ini.j2 index 1d73348c3d..eee87e9f4c 100644 --- a/roles/bodhi2/base/templates/staging.ini.j2 +++ b/roles/bodhi2/base/templates/staging.ini.j2 @@ -1,6 +1,6 @@ [filter:proxy-prefix] use = egg:PasteDeploy#prefix -prefix = /bodhi2 +prefix = /updates scheme = https [app:main] @@ -113,7 +113,7 @@ fedora_epel_master_repomd = 'http://download01.phx2.fedoraproject.org/pub/epel/% ## The base url of this application -base_address = https://admin.stg.fedoraproject.org/bodhi2/ +base_address = https://admin.stg.fedoraproject.org/updates/ ## Supported update types update_types = bugfix enhancement security newpackage