From 8bae2ce0da85c16f1859d42a079bee96a7e820dc Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 27 Sep 2019 21:04:14 +0000
Subject: [PATCH] koji / package archiving: Add fedora_koji_archive02 and
 fedora_koji_archive03

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 playbooks/groups/koji-hub.yml          |  8 ++++++++
 playbooks/groups/kojipkgs.yml          |  6 ++++++
 roles/kojipkgs/templates/kojipkgs.conf | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index c664008a85..be66002295 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -69,6 +69,14 @@
     mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive01'
     nfs_src_dir: 'fedora_koji_archive01'
     when: env == 'production' and inventory_hostname.startswith('koji')
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive02'
+    nfs_src_dir: 'fedora_koji_archive02'
+    when: env == 'production' and inventory_hostname.startswith('koji')
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive03'
+    nfs_src_dir: 'fedora_koji_archive03'
+    when: env == 'production' and inventory_hostname.startswith('koji')
   - role: nfs/client
     mnt_dir: '/mnt/koji'
     nfs_src_dir: 'fedora_s390/data'
diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml
index a7bb3a15eb..0912caa8db 100644
--- a/playbooks/groups/kojipkgs.yml
+++ b/playbooks/groups/kojipkgs.yml
@@ -31,6 +31,12 @@
   - role: nfs/client
     mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive01'
     nfs_src_dir: 'fedora_koji_archive01'
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive02'
+    nfs_src_dir: 'fedora_koji_archive02'
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive03'
+    nfs_src_dir: 'fedora_koji_archive03'
   - role: nfs/client
     mnt_dir: '/mnt/fedora_app/app'
     nfs_src_dir: 'fedora_app/app'
diff --git a/roles/kojipkgs/templates/kojipkgs.conf b/roles/kojipkgs/templates/kojipkgs.conf
index db88e66398..b36cf936fa 100644
--- a/roles/kojipkgs/templates/kojipkgs.conf
+++ b/roles/kojipkgs/templates/kojipkgs.conf
@@ -29,9 +29,13 @@ Alias /atomic-cd /mnt/fedora_koji/koji/atomic-cd
 Alias /packages /mnt/fedora_koji/koji/packages
 Alias /vol/fedora_koji_archive00/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive00/packages
 Alias /vol/fedora_koji_archive01/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive01/packages
+Alias /vol/fedora_koji_archive02/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive02/packages
+Alias /vol/fedora_koji_archive03/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive03/packages
 Alias /toplink/packages /mnt/fedora_koji/koji/packages
 Alias /toplink/vol/fedora_koji_archive00/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive00/packages
 Alias /toplink/vol/fedora_koji_archive01/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive01/packages
+Alias /toplink/vol/fedora_koji_archive02/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive02/packages
+Alias /toplink/vol/fedora_koji_archive03/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive03/packages
 
 <Directory /mnt/fedora_koji/koji/packages>
     Options Indexes FollowSymLinks
@@ -54,6 +58,20 @@ Alias /toplink/vol/fedora_koji_archive01/packages /mnt/fedora_koji/koji/vol/fedo
     Require all granted
 </Directory>
 
+<Directory /mnt/fedora_koji/koji/vol/fedora_koji_archive02/packages>
+    Options Indexes FollowSymLinks
+    IndexOptions NameWidth=* FancyIndexing
+    FileETag None
+    Require all granted
+</Directory>
+
+<Directory /mnt/fedora_koji/koji/vol/fedora_koji_archive03/packages>
+    Options Indexes FollowSymLinks
+    IndexOptions NameWidth=* FancyIndexing
+    FileETag None
+    Require all granted
+</Directory>
+
 Alias /repos-dist /mnt/fedora_koji/koji/repos-dist
 
 <Directory /mnt/fedora_koji/koji/repos-dist>