diff options
| author | Peter Robinson <pbrobinson@fedoraproject.org> | 2016-05-24 13:14:09 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@fedoraproject.org> | 2016-05-24 13:14:09 +0000 |
| commit | bdbf8776dc2216fad8d1f3c4e3bc866545af2c7d (patch) | |
| tree | be30db8289075953a0bb050654124621cacbd62d | |
| parent | eb2a895b16ae5e5d417211d5291a9cab6c9be12f (diff) | |
koji_hub: simplify secondary hub logic a little
| -rw-r--r-- | roles/koji_hub/templates/kojiweb.conf.j2 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/roles/koji_hub/templates/kojiweb.conf.j2 b/roles/koji_hub/templates/kojiweb.conf.j2 index 4487b96de..bb222c0ff 100644 --- a/roles/koji_hub/templates/kojiweb.conf.j2 +++ b/roles/koji_hub/templates/kojiweb.conf.j2 @@ -83,18 +83,22 @@ Alias /packages "/mnt/koji/packages/" </Directory> # use redirects for compose and packages locations to be consistent with primary hub -{% if inventory_hostname == 's390-koji01.qa.fedoraproject.org' %} -# +{% if inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %} # Disable these for now since there's a cert issue and no virtual host definition to redirect to # We need to either add a apache virthost and a proper cert or a seperate vm for packages. -# -#RewriteRule ^/compose(.+) https://s390pkgs.fedoraproject.org/compose$1 [R=301,L] -#RewriteRule ^/packages(.+) https://s390pkgs.fedoraproject.org/packages$1 [R=301,L] -{% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %} #RewriteRule ^/compose(.+) http://arm.koji.fedoraproject.org/compose$1 [R=301,L] #RewriteRule ^/packages(.+) http://arm.koji.fedoraproject.org/packages$1 [R=301,L] -{% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %} +{% endif %} +{% if inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %} +# Disable these for now since there's a cert issue and no virtual host definition to redirect to +# We need to either add a apache virthost and a proper cert or a seperate vm for packages. #RewriteRule ^/compose(.+) http://ppc.koji.fedoraproject.org/compose$1 [R=301,L] #RewriteRule ^/packages(.+) http://ppc.koji.fedoraproject.org/packages$1 [R=301,L] {% endif %} +{% if inventory_hostname == 's390-koji01.qa.fedoraproject.org' %} +# Disable these for now since there's a cert issue and no virtual host definition to redirect to +# We need to either add a apache virthost and a proper cert or a seperate vm for packages. +#RewriteRule ^/compose(.+) https://s390pkgs.fedoraproject.org/compose$1 [R=301,L] +#RewriteRule ^/packages(.+) https://s390pkgs.fedoraproject.org/packages$1 [R=301,L] +{% endif %} {% endif %} |