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

export composes from the koji hubs using a redirect

Browse source
This commit is contained in:
Dan Horák 2015-09-29 18:39:23 +02:00 • committed by Dennis Gilmore
parent 3744cda2bd
commit d7846832be
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,9 +64,17 @@ Alias /buildgroups "/mnt/koji/buildgroups/"
</Directory> </Directory>
{% if inventory_hostname.startswith('koji') %} {% if inventory_hostname.startswith('koji') %}
# use a redirect for packages location # use redirects for compose and packages locations
RewriteRule ^/compose(.+) https://kojipkgs.fedoraproject.org/compose$1 [R=301,L]
RewriteRule ^/packages(.+) https://kojipkgs.fedoraproject.org/packages$1 [R=301,L] RewriteRule ^/packages(.+) https://kojipkgs.fedoraproject.org/packages$1 [R=301,L]
{% else %} {% else %}
Alias /compose "/mnt/koji/compose/"
<Directory "/mnt/koji/compose/">
Options Indexes FollowSymLinks
Require all granted
</Directory>
Alias /packages "/mnt/koji/packages/" Alias /packages "/mnt/koji/packages/"
<Directory "/mnt/koji/packages/"> <Directory "/mnt/koji/packages/">
@ -74,8 +82,9 @@ Alias /packages "/mnt/koji/packages/"
Require all granted Require all granted
</Directory> </Directory>
# use a redirect for packages location to be consistent with primary hub # use redirects for compose and packages locations to be consistent with primary hub
{% if inventory_hostname == 's390-koji01.qa.fedoraproject.org' %} {% if inventory_hostname == 's390-koji01.qa.fedoraproject.org' %}
RewriteRule ^/compose(.+) https://s390pkgs.fedoraproject.org/compose$1 [R=301,L]
RewriteRule ^/packages(.+) https://s390pkgs.fedoraproject.org/packages$1 [R=301,L] RewriteRule ^/packages(.+) https://s390pkgs.fedoraproject.org/packages$1 [R=301,L]
{% endif %} {% endif %}
{% endif %} {% endif %}