From 6a4dac866c718b593b52cc3bd87135b5a7617f5a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 13 Jan 2020 22:06:51 +0000 Subject: [PATCH] nfs_client: fedora_koji_archive04 volume in all the right places Signed-off-by: Kevin Fenzi --- playbooks/groups/koji-hub.yml | 4 ++++ playbooks/groups/kojipkgs.yml | 3 +++ playbooks/groups/releng-compose.yml | 5 +++++ roles/kojipkgs/templates/kojipkgs.conf | 9 +++++++++ 4 files changed, 21 insertions(+) diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index f3a3dc2253..3b2114c80c 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -65,6 +65,10 @@ 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/fedora_koji/koji/vol/fedora_koji_archive04' + nfs_src_dir: 'fedora_koji_archive04' + 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 0912caa8db..331c705c26 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -37,6 +37,9 @@ - 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_koji/koji/vol/fedora_koji_archive04' + nfs_src_dir: 'fedora_koji_archive04' - role: nfs/client mnt_dir: '/mnt/fedora_app/app' nfs_src_dir: 'fedora_app/app' diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index c2a67b9607..dad9f93f8e 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -79,6 +79,11 @@ nfs_src_dir: '/fedora_koji_archive03' when: "'releng_compose' in group_names" + - role: nfs/client + mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive04' + nfs_src_dir: '/fedora_koji_archive04' + when: "'releng_compose' in group_names" + - role: nfs/client mnt_dir: '/mnt/fedora_koji_prod' nfs_src_dir: "{{ koji_hub_nfs }}" diff --git a/roles/kojipkgs/templates/kojipkgs.conf b/roles/kojipkgs/templates/kojipkgs.conf index b36cf936fa..160063b3d3 100644 --- a/roles/kojipkgs/templates/kojipkgs.conf +++ b/roles/kojipkgs/templates/kojipkgs.conf @@ -31,11 +31,13 @@ Alias /vol/fedora_koji_archive00/packages /mnt/fedora_koji/koji/vol/fedora_koji_ 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 /vol/fedora_koji_archive04/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive04/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 +Alias /toplink/vol/fedora_koji_archive04/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive04/packages Options Indexes FollowSymLinks @@ -72,6 +74,13 @@ Alias /toplink/vol/fedora_koji_archive03/packages /mnt/fedora_koji/koji/vol/fedo Require all granted + + Options Indexes FollowSymLinks + IndexOptions NameWidth=* FancyIndexing + FileETag None + Require all granted + + Alias /repos-dist /mnt/fedora_koji/koji/repos-dist