From becdb2fe799d5d644a75e605fcb44081727187a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 15 Nov 2024 15:39:52 +0100 Subject: [PATCH 1/5] rephrase the ansible requirements, add an example of a hosts file --- docs/filesystem_layer/stratum1.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/filesystem_layer/stratum1.md b/docs/filesystem_layer/stratum1.md index e00662525..00e2c50c8 100644 --- a/docs/filesystem_layer/stratum1.md +++ b/docs/filesystem_layer/stratum1.md @@ -79,9 +79,14 @@ create a symlink before running the playbook: sudo ln -s /lots/of/space/cvmfs /srv/cvmfs ``` -Also make sure that you have added the hostname or IP address of your server to the -`inventory/hosts` file, that you are able to log in to the server from the machine that is going to run the playbook -(preferably using an SSH key), and that you can use `sudo`. +Also make sure that: + - you are able to log in to the server from the machine that is going to run the playbook (preferably using an SSH key); + - you can use `sudo` on this machine; + - you add the hostname or IP address of your server to a `cvmfsstratum1servers` section in the `inventory/hosts` file, e.g.: +``` +[cvmfsstratum1servers] +12.34.56.789 ansible_ssh_user=yourusername +``` Finally, install the Stratum 1 using: From 93992eaf875aa7dc6b8c3ff1a9597e170bceef32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 15 Nov 2024 15:40:07 +0100 Subject: [PATCH 2/5] add sentence about replicating only the production repo --- docs/filesystem_layer/stratum1.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/filesystem_layer/stratum1.md b/docs/filesystem_layer/stratum1.md index 00e2c50c8..4f809f55b 100644 --- a/docs/filesystem_layer/stratum1.md +++ b/docs/filesystem_layer/stratum1.md @@ -95,6 +95,7 @@ Finally, install the Stratum 1 using: ansible-playbook -b [-K] [-e @inventory/local_site_specific_vars.yml] stratum1.yml ``` Running the playbook will automatically make replicas of all the repositories defined in `group_vars/all.yml`. +If you only want to replicate the `software.eessi.io` repository, you can remove the other ones from this file. ### Verification of the Stratum 1 using `curl` From b232cdaa3bb2bff555ebf93cf15974e57304add7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 15 Nov 2024 15:46:18 +0100 Subject: [PATCH 3/5] describe variables for setting geo api key --- docs/filesystem_layer/stratum1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/filesystem_layer/stratum1.md b/docs/filesystem_layer/stratum1.md index 4f809f55b..0b15a1e80 100644 --- a/docs/filesystem_layer/stratum1.md +++ b/docs/filesystem_layer/stratum1.md @@ -58,7 +58,7 @@ For the commands in this section, we are assuming that you cloned this repositor If you do want to set up the GEO API, you can find more information on how to (freely) obtain this key 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 license key in the local configuration file `inventory/local_site_specific_vars.yml` with the variables `cvmfs_geo_license_key` and `cvmfs_geo_account_id`. Start by installing Ansible, e.g.: From d415ca0c507b24d33115fde6fe780ef22d54b452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 15 Nov 2024 15:51:01 +0100 Subject: [PATCH 4/5] rephrase comment about replicating all EESSI repos --- docs/filesystem_layer/stratum1.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/filesystem_layer/stratum1.md b/docs/filesystem_layer/stratum1.md index 0b15a1e80..b02d95430 100644 --- a/docs/filesystem_layer/stratum1.md +++ b/docs/filesystem_layer/stratum1.md @@ -94,8 +94,9 @@ Finally, install the Stratum 1 using: # -b to run as root, optionally use -K if a sudo password is required, and optionally include your site-specific variables ansible-playbook -b [-K] [-e @inventory/local_site_specific_vars.yml] stratum1.yml ``` -Running the playbook will automatically make replicas of all the repositories defined in `group_vars/all.yml`. -If you only want to replicate the `software.eessi.io` repository, you can remove the other ones from this file. +Running the playbook will automatically make replicas of all the EESSI repositories defined in `inventory/group_vars/all.yml`. +If you only want to replicate the main software repository (`software.eessi.io`), +you can remove the other ones from the `eessi_cvmfs_repositories` list in this file. ### Verification of the Stratum 1 using `curl` From 4e4ababe10e56a0331c197c633c85c49ed5efff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 15 Nov 2024 15:56:37 +0100 Subject: [PATCH 5/5] add note about disabling the GEO API when using a private stratum 1 --- docs/getting_access/native_installation.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/getting_access/native_installation.md b/docs/getting_access/native_installation.md index 38c17b147..0abb79a7f 100644 --- a/docs/getting_access/native_installation.md +++ b/docs/getting_access/native_installation.md @@ -109,8 +109,15 @@ you can instruct your CernVM-FS client(s) to use it by prepending your newly cre echo 'CVMFS_SERVER_URL="http:///cvmfs/@fqrn@;$CVMFS_SERVER_URL"' | sudo tee -a /etc/cvmfs/domain.d/eessi.io.local ``` +It is also strongly recommended to disable the GEO API when using a private Stratum 1, because you want your private Stratum 1 to be picked first anyway. +In order to do this, add the following to `/etc/cvmfs/domain.d/eessi.io.local`: + +```bash +CVMFS_USE_GEOAPI=no +``` + !!! note - By prepending your new Stratum 1 to the list of existing Stratum 1 servers, your clients should by default use the private Stratum 1. + By prepending your new Stratum 1 to the list of existing Stratum 1 servers and disabling the GEO API, your clients should by default use the private Stratum 1. In case of downtime of your private Stratum 1, they will also still be able to make use of the public EESSI Stratum 1 servers.