From 87257c97618e4b99a228aea8ba2fce8715c3b59c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 14:41:33 +0100
Subject: [PATCH 01/18] use eessi.cvmfs instead of galaxyproject.cvmfs
---
client.yml | 2 +-
localproxy.yml | 2 +-
requirements.yml | 6 +++---
stratum0.yml | 2 +-
stratum1.yml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/client.yml b/client.yml
index fb0210e8..fdcdbd8c 100644
--- a/client.yml
+++ b/client.yml
@@ -3,4 +3,4 @@
- name: CVMFS clients
hosts: cvmfsclients
roles:
- - galaxyproject.cvmfs
+ - eessi.cvmfs
diff --git a/localproxy.yml b/localproxy.yml
index f4ea5efe..acbd603b 100644
--- a/localproxy.yml
+++ b/localproxy.yml
@@ -3,4 +3,4 @@
- name: CVMFS local proxies.
hosts: cvmfslocalproxies
roles:
- - galaxyproject.cvmfs
+ - eessi.cvmfs
diff --git a/requirements.yml b/requirements.yml
index 927ab847..19110b79 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -3,9 +3,9 @@
# ansible-galaxy role install -r requirements.yml -p ./roles
roles:
- - name: galaxyproject.cvmfs
- src: https://github.com/galaxyproject/ansible-cvmfs
- version: 78b2e03
+ - name: eessi.cvmfs
+ src: https://github.com/EESSI/ansible-cvmfs
+ version: 9b6e0c4
- name: geerlingguy.repo-epel
version: 3.0.0
diff --git a/stratum0.yml b/stratum0.yml
index 6635274e..16898de0 100644
--- a/stratum0.yml
+++ b/stratum0.yml
@@ -15,7 +15,7 @@
roles:
- role: geerlingguy.repo-epel
when: ansible_facts['os_family'] == 'RedHat'
- - galaxyproject.cvmfs
+ - eessi.cvmfs
- cvmfs_server_meta_info
- create_cvmfs_content_structure
...
diff --git a/stratum1.yml b/stratum1.yml
index fc605256..eba9bfc3 100644
--- a/stratum1.yml
+++ b/stratum1.yml
@@ -16,6 +16,6 @@
roles:
- role: geerlingguy.repo-epel
when: ansible_facts['os_family'] == 'RedHat'
- - galaxyproject.cvmfs
+ - eessi.cvmfs
- cvmfs_server_meta_info
...
From 6f77c7fa0d63127549222b4d75ada7478fa39f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 14:41:59 +0100
Subject: [PATCH 02/18] =?UTF-8?q?don=C2=B4t=20ignore=20roles=20subdirs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3644c9ab..39af2bac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
build
hosts
-roles/galaxyproject.cvmfs
-roles/geerlingguy.repo-epel
From 099e13907f489e48b7acbed37807c1452c2bd8a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 14:42:13 +0100
Subject: [PATCH 03/18] dont install to roles
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index 19110b79..575c6ddb 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,6 +1,6 @@
---
-# ansible-galaxy role install -r requirements.yml -p ./roles
+# ansible-galaxy role install -r requirements.yml
roles:
- name: eessi.cvmfs
From bce7c2cdb3d9aa6220dd86d6d44f923619c03d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 14:43:46 +0100
Subject: [PATCH 04/18] use eessi.cvmfs instead of galaxyproject.cvmfs
---
README.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 1f366f4c..00535c23 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,10 @@ For more details, see the Ansible installation guide: https://docs.ansible.com/a
Note that Ansible needs to be able to log in to the remote machines where you want to install some CVMFS component,
and needs to be able to use privilege escalation (e.g. `sudo`) on those machines to execute tasks with root permission.
-For the installation of all components we make use of two Ansible roles: the CVMFS installation role provided by the Galaxy project (see
-https://github.com/galaxyproject/ansible-cvmfs), and a role for adding the EPEL repository (https://github.com/geerlingguy/ansible-role-repo-epel).
+For the installation of all components we make use of two Ansible roles:
+the EESSI CVMFS installation role (see https://github.com/galaxyproject/ansible-cvmfs)
+based on the one developed by the Galaxy project (see https://github.com/galaxyproject/ansible-cvmfs),
+and a role for adding the EPEL repository (https://github.com/geerlingguy/ansible-role-repo-epel).
To download the dependency roles do:
```
From 66b7f80d9d72e6443a2f0dea31b4207a9c72fe98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 14:44:01 +0100
Subject: [PATCH 05/18] dont install to roles
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 00535c23..691b2089 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ and a role for adding the EPEL repository (https://github.com/geerlingguy/ansibl
To download the dependency roles do:
```
-ansible-galaxy role install -r requirements.yml -p ./roles
+ansible-galaxy role install -r requirements.yml
```
### Configuration
From 98f55983443f534970631196d672b42b7402c99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 14:44:57 +0100
Subject: [PATCH 06/18] change reference to galaxyproject to EESSI
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 691b2089..af512971 100644
--- a/README.md
+++ b/README.md
@@ -79,8 +79,8 @@ and, if necessary, created machine-specific configuration files in `inventory/ho
### Firewalls
To make all communication between the CVMFS services possible, some ports have to be opened on the Stratum 0 (default: port 80),
Stratum 1 (default: port 80 and 8000), and local proxy (default: port 3128).
-These default port numbers are listed in `roles/galaxyproject.cvmfs/defaults/main.yml`, but can be overridden in your local
-configuration file (`local_site_specific_vars.yml`).
+These default port numbers are listed in the file `defaults/main.yml` of the `ansible-cvmfs` role,
+but can be overridden in your local configuration file (`local_site_specific_vars.yml`).
The Ansible playbook can update your firewall rules automatically (`firewalld` on Redhat systems, `ufw` on Debian systems),
but by default it will not do this. If you want to enable this functionality, set `cvmfs_manage_firewall` to `true`.
From 680ada02a1d96631f84280c0c3ddb3215aaa922e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 15:01:26 +0100
Subject: [PATCH 07/18] bump commit of eessi.cvmfs
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index 575c6ddb..dcb8a1c1 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -5,7 +5,7 @@ roles:
- name: eessi.cvmfs
src: https://github.com/EESSI/ansible-cvmfs
- version: 9b6e0c4
+ version: be935e0
- name: geerlingguy.repo-epel
version: 3.0.0
From 06dc024e13779e5d1897f07fa49d486d5cc41053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 15:30:31 +0100
Subject: [PATCH 08/18] fix is no longer necessary
---
stratum1.yml | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/stratum1.yml b/stratum1.yml
index eba9bfc3..03c767ab 100644
--- a/stratum1.yml
+++ b/stratum1.yml
@@ -2,17 +2,6 @@
---
- name: CVMFS Stratum 1
hosts: cvmfsstratum1servers
- pre_tasks:
- - name: Fix that adds additional dependencies for Debian systems
- set_fact:
- cvmfs_packages:
- stratum1:
- - apache2
- - "{{ 'libapache2-mod-wsgi-py3' if ansible_distribution_release in ('bookworm', 'jammy') else 'libapache2-mod-wsgi' }}"
- - squid
- - cvmfs-server
- - cvmfs-config-default
- when: ansible_facts['os_family'] == 'Debian'
roles:
- role: geerlingguy.repo-epel
when: ansible_facts['os_family'] == 'RedHat'
From d1da1dec6b572cc98bf4d5f40b3d899dad364270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 15:30:43 +0100
Subject: [PATCH 09/18] fix is no longer necessary
---
stratum0.yml | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/stratum0.yml b/stratum0.yml
index 16898de0..f53fe21e 100644
--- a/stratum0.yml
+++ b/stratum0.yml
@@ -2,16 +2,6 @@
---
- name: CVMFS Stratum 0
hosts: cvmfsstratum0servers
- pre_tasks:
- - name: Fix that adds additional dependencies for Debian systems
- set_fact:
- cvmfs_packages:
- stratum0:
- - apache2
- - cvmfs-server
- - cvmfs-config-default
- - cvmfs
- when: ansible_facts['os_family'] == 'Debian'
roles:
- role: geerlingguy.repo-epel
when: ansible_facts['os_family'] == 'RedHat'
From ac4f8f2a054e3d774d4ddcbb13cef1ec3f7c38aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 15:32:52 +0100
Subject: [PATCH 10/18] bump commit of eessi.cvmfs
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index dcb8a1c1..050dd8fe 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -5,7 +5,7 @@ roles:
- name: eessi.cvmfs
src: https://github.com/EESSI/ansible-cvmfs
- version: be935e0
+ version: 2d0b958
- name: geerlingguy.repo-epel
version: 3.0.0
From 0ea5cc22b57d3d4ecd460e1fcd3eacdfc8bbe0cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Sun, 18 Feb 2024 15:46:12 +0100
Subject: [PATCH 11/18] bump commit of eessi.cvmfs
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index 050dd8fe..b3e8046e 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -5,7 +5,7 @@ roles:
- name: eessi.cvmfs
src: https://github.com/EESSI/ansible-cvmfs
- version: 2d0b958
+ version: f91be29
- name: geerlingguy.repo-epel
version: 3.0.0
From 3dd823aab40bb06175b15da659dc100547e0ee13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Thu, 11 Apr 2024 14:28:43 +0200
Subject: [PATCH 12/18] update stratum1 template for new port variables
---
templates/eessi_stratum1_squid.conf.j2 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/templates/eessi_stratum1_squid.conf.j2 b/templates/eessi_stratum1_squid.conf.j2
index 78ba7cb8..dc5adb31 100644
--- a/templates/eessi_stratum1_squid.conf.j2
+++ b/templates/eessi_stratum1_squid.conf.j2
@@ -5,10 +5,11 @@
# Contact dual-stack websites over IPv4 first
dns_v4_first on
-http_port 80 accel
-http_port 8000 accel
+{% for port in cvmfs_stratum1_http_ports %}
+http_port {{ port }} accel
+{% endfor %}
http_access allow all
-cache_peer 127.0.0.1 parent {{ cvmfs_stratum1_apache_port }} 0 no-query originserver
+cache_peer 127.0.0.1 parent {{ cvmfs_stratum1_apache_port_with_squid }} 0 no-query originserver
{% if cvmfs_stratum1_cache_dir is defined %}
cache_dir ufs {{ cvmfs_stratum1_cache_dir.dir }} {{ cvmfs_stratum1_cache_dir.size }} 16 256
From 7809aab7d9d83de5e9281d19ffe6a6cbc645ce77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Thu, 11 Apr 2024 15:10:44 +0200
Subject: [PATCH 13/18] bump commit of EESSI CVMFS role
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index b3e8046e..5df68420 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -5,7 +5,7 @@ roles:
- name: eessi.cvmfs
src: https://github.com/EESSI/ansible-cvmfs
- version: f91be29
+ version: 91aab1d
- name: geerlingguy.repo-epel
version: 3.0.0
From 60089ab53b016d1153309de048226335a47d9f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Thu, 11 Apr 2024 16:32:22 +0200
Subject: [PATCH 14/18] bump commit of eessi role
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index 5df68420..4d0549c7 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -5,7 +5,7 @@ roles:
- name: eessi.cvmfs
src: https://github.com/EESSI/ansible-cvmfs
- version: 91aab1d
+ version: 0af8e77
- name: geerlingguy.repo-epel
version: 3.0.0
From 32f8eea8188e16677600c895f5831651a227fe7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Thu, 11 Apr 2024 17:19:33 +0200
Subject: [PATCH 15/18] bump eessi.cvmfs commit
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index 4d0549c7..43479bbe 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -5,7 +5,7 @@ roles:
- name: eessi.cvmfs
src: https://github.com/EESSI/ansible-cvmfs
- version: 0af8e77
+ version: cd41783
- name: geerlingguy.repo-epel
version: 3.0.0
From 85581d62207643372ec3374bf80454e1906f4670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 12 Apr 2024 09:37:05 +0200
Subject: [PATCH 16/18] one more bump of eessi.cvmfs
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index 43479bbe..df5146cb 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -5,7 +5,7 @@ roles:
- name: eessi.cvmfs
src: https://github.com/EESSI/ansible-cvmfs
- version: cd41783
+ version: 8188eb8
- name: geerlingguy.repo-epel
version: 3.0.0
From 17bc2e3abd94276b7f58478d1aaef215fa9ecea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Mon, 3 Jun 2024 15:32:35 +0200
Subject: [PATCH 17/18] use newer commit
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index df5146cb..65aff5ca 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -5,7 +5,7 @@ roles:
- name: eessi.cvmfs
src: https://github.com/EESSI/ansible-cvmfs
- version: 8188eb8
+ version: cb7a4de
- name: geerlingguy.repo-epel
version: 3.0.0
From f1be34d20067fca10cfd0239082e216e8855a55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Mon, 3 Jun 2024 15:34:17 +0200
Subject: [PATCH 18/18] add note about Geo API account id
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index af512971..d4c0a1c1 100644
--- a/README.md
+++ b/README.md
@@ -104,12 +104,12 @@ In order to do this, clone this `filesystem-layer` repository, and let your cron
a run of the playbook (e.g. `ansible-playbook --connection=local create_cvmfs_content_structure.yml`).
### Stratum 1
-Installing a Stratum 1 requires a GEO API license key, which will be used to find
+Installing a Stratum 1 requires a GEO API account id and license key, which will be used to find
the (geographically) closest Stratum 1 server for your client and proxies.
More information on how to (freely) obtain this key is available in the CVMFS documentation:
https://cvmfs.readthedocs.io/en/stable/cpt-replica.html#geo-api-setup .
-You can put your license key in the local configuration file `inventory/local_site_specific_vars.yml`.
+You can put your account id and license key in the local configuration file `inventory/local_site_specific_vars.yml`.
Furthermore, the Stratum 1 runs a Squid server. The template configuration file can be found at
`templates/eessi_stratum1_squid.conf.j2`.