From 1b3258ef49414f17e73f26fe805329e6a1d71fe1 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 7 Jul 2020 13:41:04 -0700
Subject: [PATCH] download: mount fedora_odcs on download servers for easier
 internal sync

The fedora_odcs volume is available on odcs-frontend01, but it's easier
for internal people to get it via dl servers since they already get some
content there. So, we just mount it (ro) there so they can do so.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 playbooks/groups/download.yml                   |  1 +
 .../httpd/dl.fedoraproject.org/secondary.conf   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml
index daed9b846a..23628b1553 100644
--- a/playbooks/groups/download.yml
+++ b/playbooks/groups/download.yml
@@ -38,6 +38,7 @@
   - rsyncd
   - { role: nfs/client, when: datacenter == "iad2" or datacenter == "rdu", mnt_dir: '/srv/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
   - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/mnt/koji/compose',  nfs_src_dir: 'fedora_koji/koji/compose' } # needed for internal sync
+  - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/srv/odcs',  nfs_src_dir: 'fedora_odcs' } # needed for internal sync
   - sudo
   - { role: openvpn/client, when: vpn == True }
 
diff --git a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf
index 0a5a00577c..be85ad32d8 100644
--- a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf
+++ b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf
@@ -1,4 +1,5 @@
 Alias /pub /srv/pub
+Alias /odcs /srv/odcs
 
 DocumentRoot /srv/web
 
@@ -17,6 +18,22 @@ DocumentRoot /srv/web
   </IfModule>
 </Directory>
 
+<Directory /srv/odcs>
+  HeaderName /HEADER.html
+  ReadmeName /FOOTER.html
+  Options Indexes FollowSymLinks
+  <IfModule mod_authz_core.c>
+    # Apache 2.4
+    Require all granted
+    IndexOptions NameWidth=* FancyIndexing
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    # Apache 2.2
+    Order allow,deny
+    Allow from all
+  </IfModule>
+</Directory>
+
 <Directory /srv/pub>
   HeaderName /HEADER.html
   ReadmeName /FOOTER.html