From d7846832be75d2e3baa5be2dff63c7c06d29b7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Tue, 29 Sep 2015 18:39:23 +0200
Subject: [PATCH] export composes from the koji hubs using a redirect

---
 roles/koji_hub/templates/kojiweb.conf.j2 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/roles/koji_hub/templates/kojiweb.conf.j2 b/roles/koji_hub/templates/kojiweb.conf.j2
index f8393ae0c0..f05d021667 100644
--- a/roles/koji_hub/templates/kojiweb.conf.j2
+++ b/roles/koji_hub/templates/kojiweb.conf.j2
@@ -64,9 +64,17 @@ Alias /buildgroups "/mnt/koji/buildgroups/"
 </Directory>
 
 {% 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]
 {% else %}
+Alias /compose "/mnt/koji/compose/"
+
+<Directory "/mnt/koji/compose/">
+    Options Indexes FollowSymLinks
+    Require all granted
+</Directory>
+
 Alias /packages "/mnt/koji/packages/"
 
 <Directory "/mnt/koji/packages/">
@@ -74,8 +82,9 @@ Alias /packages "/mnt/koji/packages/"
     Require all granted
 </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' %}
+RewriteRule ^/compose(.+) https://s390pkgs.fedoraproject.org/compose$1  [R=301,L]
 RewriteRule ^/packages(.+) https://s390pkgs.fedoraproject.org/packages$1  [R=301,L]
 {% endif %}
 {% endif %}