From ac2d857eadd49b1912ba75ed85d4adbf346652cf Mon Sep 17 00:00:00 2001 From: CatalinCondurache Date: Tue, 14 Feb 2023 12:02:04 +0000 Subject: [PATCH 1/8] Update _index.md Service name has changed from Content Distribution to Software Distribution --- content/en/users/compute/content-distribution/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/en/users/compute/content-distribution/_index.md b/content/en/users/compute/content-distribution/_index.md index 78439d4d81..acd332fc7a 100644 --- a/content/en/users/compute/content-distribution/_index.md +++ b/content/en/users/compute/content-distribution/_index.md @@ -1,13 +1,13 @@ --- -title: Content Distribution +title: Software Distribution linkTitle: Content Distribution type: docs weight: 70 description: > - Content (software) distribution in the EGI infrastructure + Software distribution in the EGI infrastructure --- -This page is about the CVMFS service operated for EGI by RAL. +This page is about the CernVM-FS (CVMFS) service operated for EGI by UKRI-STFC. ## Overview From 68c28afffdd4fab3f229fb2bec20ac9b4b7d75da Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Thu, 9 Mar 2023 14:33:32 +0100 Subject: [PATCH 2/8] Add the alias before moving the page --- content/en/users/compute/content-distribution/_index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/en/users/compute/content-distribution/_index.md b/content/en/users/compute/content-distribution/_index.md index fed36525bc..6ac60d566f 100644 --- a/content/en/users/compute/content-distribution/_index.md +++ b/content/en/users/compute/content-distribution/_index.md @@ -5,6 +5,8 @@ type: docs weight: 70 description: > Software distribution in the EGI infrastructure +aliases: + - /users/compute/content-distribution --- This page documents usage the CernVM-FS (CVMFS) service operated for EGI by UKRI-STFC. From 90ee0d18164b46186f957617bb47d1b41536ad6a Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Thu, 9 Mar 2023 14:34:22 +0100 Subject: [PATCH 3/8] Rename content-distribution to software-distribution in URL path --- .../{content-distribution => software-distribution}/_index.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename content/en/users/compute/{content-distribution => software-distribution}/_index.md (100%) diff --git a/content/en/users/compute/content-distribution/_index.md b/content/en/users/compute/software-distribution/_index.md similarity index 100% rename from content/en/users/compute/content-distribution/_index.md rename to content/en/users/compute/software-distribution/_index.md From ab3cd90b43c72f09e0ebb459b356a1f6138edc2b Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Thu, 9 Mar 2023 14:35:21 +0100 Subject: [PATCH 4/8] Rename content-distribution to software-distribution in URL path --- content/en/users/dev-env/notebooks/kernels/default/_index.md | 2 +- content/en/users/getting-started/communities/dmcc/_index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/users/dev-env/notebooks/kernels/default/_index.md b/content/en/users/dev-env/notebooks/kernels/default/_index.md index d055e02110..8840992c91 100644 --- a/content/en/users/dev-env/notebooks/kernels/default/_index.md +++ b/content/en/users/dev-env/notebooks/kernels/default/_index.md @@ -42,7 +42,7 @@ way to support your request. ## CVMFS -Notebooks mounts several [CVMFS](../../../../compute/content-distribution/) +Notebooks mounts several [CVMFS](../../../../compute/software-distribution/) repositories where you can find software relevant to your community. These are accessible from the default CVMFS location `/cvmfs` and also linked in your home directory `/home/jovyan/cvmfs`. These repositories are available: diff --git a/content/en/users/getting-started/communities/dmcc/_index.md b/content/en/users/getting-started/communities/dmcc/_index.md index 6f64c4fc82..4d6e72b42c 100644 --- a/content/en/users/getting-started/communities/dmcc/_index.md +++ b/content/en/users/getting-started/communities/dmcc/_index.md @@ -34,7 +34,7 @@ The official solution to distribute software in the EGI Infrastructure is to use [CVMFS](https://cernvm.cern.ch/fs/), the Software Distribution Service developed to assist High Energy Physics collaborations at CERN. For more details, please refer to the -[Contend Distribution](../../compute/content-distribution/) documentation. +[Contend Distribution](../../compute/software-distribution/) documentation. The following alternative solutions for sharing scientific software in the EGI Infrastructure are also available: From a4a034e6ed58740b2472d925621447aed6f59adc Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Thu, 9 Mar 2023 14:57:07 +0100 Subject: [PATCH 5/8] Fix some broken links --- .../communities/dmcc/_index.md | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/content/en/users/getting-started/communities/dmcc/_index.md b/content/en/users/getting-started/communities/dmcc/_index.md index 4d6e72b42c..1937ab02ee 100644 --- a/content/en/users/getting-started/communities/dmcc/_index.md +++ b/content/en/users/getting-started/communities/dmcc/_index.md @@ -16,7 +16,7 @@ community. Getting access to the EGI infrastructure consists of the following steps: -1. [Sign-up](../../aai/check-in/signup/) for an EGI Check-In account. +1. [Sign-up](../../../aai/check-in/signup/) for an EGI Check-In account. 1. Request to join the `vo.environmental.egi.eu` Virtual Organisation (VO) by visiting the [enrollment URL](https://aai.egi.eu/registry/co_petitions/start/coef:369) with your EGI Check-In account. The subscription requires approval from the @@ -34,13 +34,13 @@ The official solution to distribute software in the EGI Infrastructure is to use [CVMFS](https://cernvm.cern.ch/fs/), the Software Distribution Service developed to assist High Energy Physics collaborations at CERN. For more details, please refer to the -[Contend Distribution](../../compute/software-distribution/) documentation. +[Contend Distribution](../../../compute/software-distribution/) documentation. The following alternative solutions for sharing scientific software in the EGI Infrastructure are also available: * Use the [EGI Applications Database](https://appdb.egi.eu/) (AppDB): - either [packaging your application in a custom Virtual Machine](../../compute/cloud-compute/images/) + either [packaging your application in a custom Virtual Machine](../../../compute/cloud-compute/images/) or [uploading a Virtual Appliance](https://wiki.appdb.egi.eu/main:faq:how_to_register_a_virtual_appliance). * Use [Docker](https://www.docker.com/) containers via the [EGI Cloud Compute Service](../../compute/cloud-container-compute/). @@ -53,16 +53,16 @@ in the EGI Infrastructure. For managing data, different Data Management services are available in the EGI Infrastructure: -* [EGI DataHub](../../data/management/datahub/) -* [EGI Data Transfer](../../data/management/data-transfer/) -* [EGI Data Orchestrator](../../data/management/rucio/) -* [OpenRDM](../../data/management/open-rdm/) +* [EGI DataHub](../../../data/management/datahub/) +* [EGI Data Transfer](../../../data/management/data-transfer/) +* [EGI Data Orchestrator](../../../data/management/rucio/) +* [OpenRDM](../../../data/management/open-rdm/) -For more information, please see the [Data Management section](../../data/management/) and -the [tutorials](../../tutorials/). The following tutorials may be relevant: +For more information, please see the [Data Management section](../../../data/management/) and +the [tutorials](../../../tutorials/). The following tutorials may be relevant: -* [Create a Virtual Machine with Jupyter and DataHub](../..//tutorials/jupyter-datahub-virtual-machine/) -* [Access DataHub from a Virtual Machine](../../tutorials/vm-datahub/) +* [Create a Virtual Machine with Jupyter and DataHub](../../../tutorials/jupyter-datahub-virtual-machine/) +* [Access DataHub from a Virtual Machine](../../../tutorials/vm-datahub/) ## Service Providers @@ -71,4 +71,4 @@ the [tutorials](../../tutorials/). The following tutorials may be relevant: The steps that an OpenStack cloud provider needs to follow to add resources to the Disaster Mitigation and Agriculture community Virtual Organisation (i.e. `vo.environmental.egi.eu`) are available in the -[VO Configuration guide for providers](../../../providers/cloud-compute/openstack/vo_config/). +[VO Configuration guide for providers](../../../../providers/cloud-compute/openstack/vo_config). From 1425d07d4f72e3f8b27d687118f5f915194a2c95 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Thu, 9 Mar 2023 15:00:12 +0100 Subject: [PATCH 6/8] Fix some more broken links --- content/en/users/getting-started/communities/dmcc/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/users/getting-started/communities/dmcc/_index.md b/content/en/users/getting-started/communities/dmcc/_index.md index 1937ab02ee..479b066108 100644 --- a/content/en/users/getting-started/communities/dmcc/_index.md +++ b/content/en/users/getting-started/communities/dmcc/_index.md @@ -43,10 +43,10 @@ EGI Infrastructure are also available: either [packaging your application in a custom Virtual Machine](../../../compute/cloud-compute/images/) or [uploading a Virtual Appliance](https://wiki.appdb.egi.eu/main:faq:how_to_register_a_virtual_appliance). * Use [Docker](https://www.docker.com/) containers via the - [EGI Cloud Compute Service](../../compute/cloud-container-compute/). + [EGI Cloud Compute Service](../../../compute/cloud-container-compute/). To get started, have a look at the tutorial to -[create your first Virtual Machine](../../tutorials/create-your-first-virtual-machine/) +[create your first Virtual Machine](../../../tutorials/create-your-first-virtual-machine/) in the EGI Infrastructure. ### How to bring your data to the EGI infrastructure From 802627409f9b6ecd9cb2e627dfb8f440eb66d569 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Thu, 9 Mar 2023 15:11:09 +0100 Subject: [PATCH 7/8] Stop checking relative links pointing to ../providers/cloud-compute Checking relative links pointing to providers/cloud-compute is broken since long, as documented in #294 --- .github/linters/mlc_config.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/linters/mlc_config.json b/.github/linters/mlc_config.json index 4f787cc1eb..50e884e55a 100644 --- a/.github/linters/mlc_config.json +++ b/.github/linters/mlc_config.json @@ -65,6 +65,9 @@ }, { "pattern": "^https://aai.egi.eu/device*" + }, + { + "pattern": "^../.*/providers/cloud-compute/*" } ] } From f864608467d097aa5d278c547df732dc23751cb2 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Fri, 10 Mar 2023 09:28:19 +0100 Subject: [PATCH 8/8] Only pages under /providers/cloud-compute/openstack should be problematic --- .github/linters/mlc_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/linters/mlc_config.json b/.github/linters/mlc_config.json index 50e884e55a..215e460947 100644 --- a/.github/linters/mlc_config.json +++ b/.github/linters/mlc_config.json @@ -67,7 +67,7 @@ "pattern": "^https://aai.egi.eu/device*" }, { - "pattern": "^../.*/providers/cloud-compute/*" + "pattern": "^../.*/providers/cloud-compute/openstack/*" } ] }