From ffdc193701ce5b64c22847ea255d7d01d688f469 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Tue, 6 Aug 2019 18:25:28 +0000
Subject: [PATCH] removing koji/compose from downloads as nothing seems to be
 getting packages from it

---
 playbooks/groups/download.yml                       |  1 -
 roles/download/tasks/main.yml                       |  3 ---
 .../templates/httpd/dl.fedoraproject.org.conf       | 13 -------------
 roles/rsyncd/templates/rsyncd.conf.download.j2      | 10 ----------
 4 files changed, 27 deletions(-)

diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml
index bf8fa026ba..f578aabc07 100644
--- a/playbooks/groups/download.yml
+++ b/playbooks/groups/download.yml
@@ -38,7 +38,6 @@
   - { role: mod_limitipconn, when: ansible_distribution_major_version|int != '7'}
   - rsyncd
   - { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/srv/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
-  - { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/mnt/koji/compose',  nfs_src_dir: 'fedora_koji/koji/compose' }
   - { role: nfs/client, when: datacenter == "rdu", mnt_dir: '/srv/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
   - sudo
   - { role: openvpn/client, when: datacenter != "phx2" }
diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml
index 799307b0e0..c90aec2495 100644
--- a/roles/download/tasks/main.yml
+++ b/roles/download/tasks/main.yml
@@ -16,9 +16,6 @@
 - name: Create /srv/web directory
   file: path=/srv/web state=directory
 
-- name: Create /mnt/koji/compose directory
-  file: path=/mnt/koji/compose state=directory
-
 - name: Set httpd_use_nfs seboolean
   seboolean: name=httpd_use_nfs state=yes persistent=yes
 
diff --git a/roles/download/templates/httpd/dl.fedoraproject.org.conf b/roles/download/templates/httpd/dl.fedoraproject.org.conf
index cdff299153..edf3c7223f 100644
--- a/roles/download/templates/httpd/dl.fedoraproject.org.conf
+++ b/roles/download/templates/httpd/dl.fedoraproject.org.conf
@@ -27,18 +27,5 @@
    SSLProtocol {{ ssl_protocols }}
    SSLCipherSuite {{ ssl_ciphers }}
 
-{% if inventory_hostname.startswith('download0') %}
-  # In phx2, also serve /compose content
-  Alias /compose /mnt/koji/compose
-
-  <Directory /mnt/koji/compose>
-    HeaderName /HEADER.html
-    ReadmeName /FOOTER.html
-    Options Indexes FollowSymLinks
-    Require all granted
-    IndexOptions NameWidth=* FancyIndexing
-  </Directory>
-
-{% endif %}
   Include "conf.d/dl.fedoraproject.org/*.conf"
 </VirtualHost>
diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2
index 2eaca0748e..99a83e1108 100644
--- a/roles/rsyncd/templates/rsyncd.conf.download.j2
+++ b/roles/rsyncd/templates/rsyncd.conf.download.j2
@@ -149,16 +149,6 @@ refuse options = checksum
        gid = 263
        hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %}
 
-{% if datacenter == 'phx2' %}
-[fedora-compose0]
-       comment = Fedora composes
-       path = /mnt/koji/compose
-       list = no
-       uid = nobody
-       gid = nobody
-       hosts allow = 10.0.0.0/8, 209.132.0.0/16
-{% endif %}
-
 # For distributing applications
 [log]
        comment = Server Logs