Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

koji_hub: simplify secondary hub logic a little

Browse source
This commit is contained in:
Peter Robinson 2016-05-24 13:14:09 +00:00
parent eb2a895b16
commit bdbf8776dc
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
roles/koji_hub/templates/kojiweb.conf.j2
View file

@ -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 %}