From 5ab90880feb89b7ed49f70c27fcc478d7aa8c7f2 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Fri, 1 Apr 2016 09:46:57 +0000
Subject: [PATCH] koji hub: make kojihub.conf add add arm.koji bit needed for
 serving files as secondary doesn't have separate kojipkgs

---
 roles/koji_hub/tasks/main.yml                         |  6 ++++--
 .../{files/kojihub.conf => templates/kojihub.conf.j2} | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 rename roles/koji_hub/{files/kojihub.conf => templates/kojihub.conf.j2} (70%)

diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml
index 1e58a87c8b..6143a6512a 100644
--- a/roles/koji_hub/tasks/main.yml
+++ b/roles/koji_hub/tasks/main.yml
@@ -222,7 +222,6 @@
 - name: koji web common config files
   copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root
   with_items:
-  - kojihub.conf
   - mash.conf
   - rel-eng.conf
   - repo.conf
@@ -232,7 +231,10 @@
   notify: reload httpd
 
 - name: koji web hub specific config files
-  template: src=kojiweb.conf.j2 dest=/etc/httpd/conf.d/kojiweb.conf owner=root group=root
+  template: src={{ item }}.j2 dest=/etc/httpd/conf.d/{{ item }} owner=root group=root
+  with_items:
+  - kojiweb.conf
+  - kojihub.conf
   tags:
   - config
   - koji_hub
diff --git a/roles/koji_hub/files/kojihub.conf b/roles/koji_hub/templates/kojihub.conf.j2
similarity index 70%
rename from roles/koji_hub/files/kojihub.conf
rename to roles/koji_hub/templates/kojihub.conf.j2
index 0bba670136..e384bb6af7 100644
--- a/roles/koji_hub/files/kojihub.conf
+++ b/roles/koji_hub/templates/kojihub.conf.j2
@@ -12,6 +12,17 @@ Alias /kojihub /usr/share/koji-hub/kojixmlrpc.py
     Require all granted
 </Directory>
 
+{% if inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
+# Also serve /mnt/koji
+Alias /kojifiles "/mnt/koji/"
+
+<Directory "/mnt/koji">
+   Options Indexes FollowSymLinks
+   AllowOverride None
+   Order allow,deny
+   Allow from all
+</Directory>
+{% endif %}
 
 <Location /kojihub/ssllogin>
          SSLVerifyClient require