From e0662c5f2dea6a2329f34ff0840683672236e8b0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 17 May 2021 13:46:36 -0700 Subject: [PATCH] rsyncd / download: adjust odcs to allow package rsyncs odcs just links to the packages in a compose on the /mnt/koji volume with relative symlinks. ie ( ../../../../../../../../mnt/koji/packages/zip/3.0/28.eln109/data/signed/9867c58f/x86_64/zip-3.0-28.eln109.x86_64.rpm ) Change odcs on download servers to mount on /mnt like koji and then tell rsync to chroot at /mnt, so it can follow those links and copy the file from koji volume. Signed-off-by: Kevin Fenzi --- playbooks/groups/download.yml | 2 +- .../download/files/httpd/dl.fedoraproject.org/secondary.conf | 4 ++-- roles/rsyncd/templates/rsyncd.conf.download.j2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index a5238e8ec9..051fe40b6e 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -40,7 +40,7 @@ - { 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" or datacenter == "rdu", mnt_dir: '/srv/pub/archive', nfs_src_dir: 'fedora_ftp_archive' } - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/mnt/koji', nfs_src_dir: 'fedora_koji/koji/' } # needed for internal sync and odcs - - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/srv/odcs', nfs_src_dir: 'fedora_odcs' } # needed for internal sync + - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/mnt/odcs', nfs_src_dir: 'fedora_odcs' } # needed for internal sync - sudo pre_tasks: diff --git a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf index be85ad32d8..7f0f3695ae 100644 --- a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf +++ b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf @@ -1,5 +1,5 @@ Alias /pub /srv/pub -Alias /odcs /srv/odcs +Alias /odcs /mnt/odcs DocumentRoot /srv/web @@ -18,7 +18,7 @@ DocumentRoot /srv/web - + HeaderName /HEADER.html ReadmeName /FOOTER.html Options Indexes FollowSymLinks diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index 47e212a3af..4af35b9cfb 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -96,7 +96,7 @@ refuse options = checksum [ fedora-eln ] comment = Fedora ELN composes - path = /srv/odcs + path = /./mnt/odcs {% if inventory_hostname in groups['download_tier1'] %} hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %}