From 520ab54221e02b87b94c677cfc5cae65b73f5775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Tue, 15 Nov 2022 11:06:12 +0100
Subject: [PATCH] Use new and preferred S3-based mirror for CernVM packages

---
 tasks/client.yml      | 2 +-
 tasks/init_debian.yml | 8 ++++----
 tasks/init_redhat.yml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tasks/client.yml b/tasks/client.yml
index 502ca56..399f7d1 100644
--- a/tasks/client.yml
+++ b/tasks/client.yml
@@ -123,7 +123,7 @@
 
 - name: Download cvmfs_preload utility when desired
   get_url:
-    url: https://cvmrepo.web.cern.ch/cvmrepo/preload/cvmfs_preload
+    url: https://cvmrepo.s3.cern.ch/cvmrepo/preload/cvmfs_preload
     dest: "{{ cvmfs_preload_path }}/cvmfs_preload"
     owner: root
     group: root
diff --git a/tasks/init_debian.yml b/tasks/init_debian.yml
index 0aa65d6..54ad97f 100644
--- a/tasks/init_debian.yml
+++ b/tasks/init_debian.yml
@@ -8,20 +8,20 @@
 
 - name: Install CernVM apt key
   apt_key:
-    url: https://cvmrepo.web.cern.ch/cvmrepo/apt/cernvm.gpg
+    url: https://cvmrepo.s3.cern.ch/cvmrepo/apt/cernvm.gpg
 
 - name: Configure CernVM apt repository
   apt_repository:
     filename: "cernvm.list"
     mode: 422
-    repo: "deb [allow-insecure=true] https://cvmrepo.web.cern.ch/cvmrepo/apt/ {{ ansible_distribution_release }}-prod main"
+    repo: "deb [allow-insecure=true] https://cvmrepo.s3.cern.ch/cvmrepo/apt/ {{ ansible_distribution_release }}-prod main"
   when: ansible_distribution != 'Ubuntu'
 
 - name: Configure CernVM apt repository
   apt_repository:
     filename: "cernvm.list"
     mode: 422
-    repo: "deb [allow-insecure=true] https://cvmrepo.web.cern.ch/cvmrepo/apt/ {{ ansible_distribution_release }}-prod main"
+    repo: "deb [allow-insecure=true] https://cvmrepo.s3.cern.ch/cvmrepo/apt/ {{ ansible_distribution_release }}-prod main"
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_release in ('bionic', 'xenial', 'precise', 'focal')
 
   # There are no packages for any of the non LTS versions so good
@@ -30,7 +30,7 @@
   apt_repository:
     filename: "cernvm.list"
     mode: 422
-    repo: "deb [allow-insecure=true] https://cvmrepo.web.cern.ch/cvmrepo/apt/ xenial-prod main"
+    repo: "deb [allow-insecure=true] https://cvmrepo.s3.cern.ch/cvmrepo/apt/ xenial-prod main"
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_release not in ('bionic', 'xenial', 'precise', 'focal')
 
 - name: Install CernVM-FS packages and dependencies (apt)
diff --git a/tasks/init_redhat.yml b/tasks/init_redhat.yml
index 8c5f550..c38c84e 100644
--- a/tasks/init_redhat.yml
+++ b/tasks/init_redhat.yml
@@ -15,10 +15,10 @@
   with_items:
     - name: cernvm
       description: "CernVM packages"
-      baseurl: "http://cvmrepo.web.cern.ch/cvmrepo/yum/cvmfs/EL/$releasever/$basearch/"
+      baseurl: "http://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/EL/$releasever/$basearch/"
     - name: cernvm-config
       description: "CernVM-FS extra config packages"
-      baseurl: "http://cvmrepo.web.cern.ch/cvmrepo/yum/cvmfs-config/EL/$releasever/$basearch/"
+      baseurl: "http://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-config/EL/$releasever/$basearch/"
 
 - name: Install CernVM yum key
   copy: