From 3060edc4d396f0768279beb99f93d2333df8d0c1 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Thu, 5 Jan 2023 11:13:00 +0000 Subject: [PATCH 01/16] :memo: Note that v4.0.2 was used for December 2022 Turing DSG --- VERSIONING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/VERSIONING.md b/VERSIONING.md index f9bfc41134..5bf727bda2 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -62,6 +62,7 @@ We usually deploy the latest available version of the Data Safe Haven for each o | April 2020 | DSG 2020-04 (event cancelled) | [v2.0.0-beta](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v2.0.0-beta) | | June 2020 | DSSG 2020 | [v3.0.0-beta](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v3.0.0-beta) | | December 2021 | DSG 2021-12 | [v3.3.1](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v3.3.1) | +| December 2022 | DSG 2022-12 | [v4.0.2](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v4.0.2) | ## Versions that have undergone formal security evaluation From 29f30a0b9629e197cd3508545e0e966d91e8b450 Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Wed, 25 Jan 2023 10:58:58 +0000 Subject: [PATCH 02/16] add README --- docs/README.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docs/README.md diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000000..f553f74456 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,7 @@ +To build the docs locally, simply type: + +``` +make html +``` + +This will add the contents to a folder called `_output`. \ No newline at end of file From 797b7c75f00f5df0c3105f468dd91f32248ba980 Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Wed, 25 Jan 2023 11:00:53 +0000 Subject: [PATCH 03/16] add link to Python versions --- docs/deployment/snippets/14_run_smoke_tests.partial.md | 2 +- docs/roles/researcher/snippets/04_using_srd.partial.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/deployment/snippets/14_run_smoke_tests.partial.md b/docs/deployment/snippets/14_run_smoke_tests.partial.md index 2cf5af8a0e..a44f332d24 100644 --- a/docs/deployment/snippets/14_run_smoke_tests.partial.md +++ b/docs/deployment/snippets/14_run_smoke_tests.partial.md @@ -10,4 +10,4 @@ They are automatically uploaded to the SRD during the deployment step. - if any of the tests fail, check the `README.md` in this folder for help in diagnosing the issues - Copy `tests/test_jupyter.ipynb` to your home directory - activate each of the available Python versions in turn - - run `jupyter notebook` in each case and check that you can run the notebook and that all versions and paths match throughout + - run `jupyter notebook` in each case and check that you can run the notebook and that all versions and paths match throughout. See {ref}`Available Python Versions `. diff --git a/docs/roles/researcher/snippets/04_using_srd.partial.md b/docs/roles/researcher/snippets/04_using_srd.partial.md index 92c0ed1cfc..7b8fefcfc0 100644 --- a/docs/roles/researcher/snippets/04_using_srd.partial.md +++ b/docs/roles/researcher/snippets/04_using_srd.partial.md @@ -78,6 +78,8 @@ For example: :align: center ``` +(available_python_and_r_versions)= + ### {{snake}} Available Python and R versions Typing `R` at the command line will give you the system version of `R` with many custom packages pre-installed. From 40f186f1c4b8e2db68c55abcf26dc4f125feb4e2 Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Wed, 25 Jan 2023 11:10:53 +0000 Subject: [PATCH 04/16] lint md --- docs/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index f553f74456..e7a8699115 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,7 +1,7 @@ To build the docs locally, simply type: -``` +```{bash} make html ``` -This will add the contents to a folder called `_output`. \ No newline at end of file +This will add the contents to a folder called `_output`. From 880bd1147e55e8182421e41555936c48b59a4fdb Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Wed, 25 Jan 2023 15:32:44 +0000 Subject: [PATCH 05/16] remove docs/README and add to main readme --- README.md | 14 ++++++++++++++ docs/README.md | 7 ------- 2 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 docs/README.md diff --git a/README.md b/README.md index 8ff4c7e4fd..3981c90704 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,20 @@ Read our [versioning scheme](VERSIONING.md) for how we number and label releases We value those who take the time and effort to report security vulnerabilities. If you believe you have found a security vulnerability, please report it as outlined in our [Security and vulnerability disclosure policy](SECURITY.md). +## :book: Docs + +The docs, including for older releases, are available [here](https://alan-turing-institute.github.io/data-safe-haven). + +To build the docs locally, check out the repo, navigate to the `docs` folder and `make` them: + +```{bash} +git clone https://github.com/alan-turing-institute/data-safe-haven.git +cd data-safe-haven/docs +make html +``` + +This will add the contents to a folder called `_output` inside `docs`. + ## :bow: Acknowledgements We are grateful for the following support for this project: diff --git a/docs/README.md b/docs/README.md deleted file mode 100644 index e7a8699115..0000000000 --- a/docs/README.md +++ /dev/null @@ -1,7 +0,0 @@ -To build the docs locally, simply type: - -```{bash} -make html -``` - -This will add the contents to a folder called `_output`. From ed43809a8b984f5f5be95a43a03b46046028a99f Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Wed, 25 Jan 2023 17:11:04 +0000 Subject: [PATCH 06/16] update contributor guide --- CONTRIBUTING.md | 16 ++++++++++++++++ README.md | 10 +--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dda4145c9b..8b04215563 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,6 +26,7 @@ Jump to the following sections: - [Working in a private repository](#working-in-a-private-repository) - [Who's involved in the project](#whos-involved-in-the-project) - [Make a change with a pull request](#making-a-change-with-a-pull-request) + - [Make a change to documentation](#making-a-change-to-documentation) ## A DevOps development philosophy @@ -219,6 +220,21 @@ You can update your [fork](https://docs.github.com/en/get-started/quickstart/for GitHub has a [nice introduction](https://docs.github.com/en/get-started/quickstart/github-flow) to the pull request workflow, but please [get in touch](#get-in-touch) if you have any questions :balloon:. +### Making a change to documentation + +The docs, including for older releases, are available [here](https://alan-turing-institute.github.io/data-safe-haven). + +You should follow the same instructions as above to [make a change with a pull request](#making-a-change-with-a-pull-request) when editing the documentation. + +To test your changes, build the docs locally by checking out your fork of the repo, navigating to the `docs` folder and `make`ing them: + +```{bash} +cd data-safe-haven/docs +make html +``` + +This will add the contents to a folder called `_output` inside `docs`. Open the index html from a browser and you should be able to navigate the docs and view your changes. + ### Who's involved in the project As some users have `GitHub` IDs that make it a little difficult to know who they are in real life and it's sometimes nice to know **who** you're working with on the project, hopefully this table will help you put names to faces and IDs :sparkles: diff --git a/README.md b/README.md index 3981c90704..087b07c7e0 100644 --- a/README.md +++ b/README.md @@ -48,15 +48,7 @@ If you believe you have found a security vulnerability, please report it as outl The docs, including for older releases, are available [here](https://alan-turing-institute.github.io/data-safe-haven). -To build the docs locally, check out the repo, navigate to the `docs` folder and `make` them: - -```{bash} -git clone https://github.com/alan-turing-institute/data-safe-haven.git -cd data-safe-haven/docs -make html -``` - -This will add the contents to a folder called `_output` inside `docs`. +See the [Contributor Guide](CONTRIBUTING.md#making-a-change-to-documentation) for how to make changes to the docs. ## :bow: Acknowledgements From 8542f4e9e428dbdc6eb4169bda772e60ab74884a Mon Sep 17 00:00:00 2001 From: James Robinson Date: Wed, 25 Jan 2023 17:21:13 +0000 Subject: [PATCH 07/16] :memo: Minor rewording of documentation section --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 087b07c7e0..2970efecd4 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,11 @@ There are lots of ways to contribute, not just writing code! See our [Code of Conduct](CODE_OF_CONDUCT.md) and our [Contributor Guide](CONTRIBUTING.md) to learn more about how we work together as a community and how you can contribute. +## :book: Documentation + +Full documentation is available at the [Data Safe Haven website](https://alan-turing-institute.github.io/data-safe-haven). +If you think anything there is unclear, please consider reading how to contribute a documentation change in our [Contributor Guide](CONTRIBUTING.md#making-a-change-to-documentation). + ## :cake: Releases If you're new to the project, why not check out our [latest release](https://github.com/alan-turing-institute/data-safe-haven/releases/latest)? @@ -44,12 +49,6 @@ Read our [versioning scheme](VERSIONING.md) for how we number and label releases We value those who take the time and effort to report security vulnerabilities. If you believe you have found a security vulnerability, please report it as outlined in our [Security and vulnerability disclosure policy](SECURITY.md). -## :book: Docs - -The docs, including for older releases, are available [here](https://alan-turing-institute.github.io/data-safe-haven). - -See the [Contributor Guide](CONTRIBUTING.md#making-a-change-to-documentation) for how to make changes to the docs. - ## :bow: Acknowledgements We are grateful for the following support for this project: From c0635909d8bd724996ff101fe99cf3a4b735b94f Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Thu, 26 Jan 2023 09:35:36 +0000 Subject: [PATCH 08/16] Update CONTRIBUTING.md Co-authored-by: Jim Madge --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8b04215563..def0402e23 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ Jump to the following sections: - [Working in a private repository](#working-in-a-private-repository) - [Who's involved in the project](#whos-involved-in-the-project) - [Make a change with a pull request](#making-a-change-with-a-pull-request) - - [Make a change to documentation](#making-a-change-to-documentation) + - [Make a change to the documentation](#making-a-change-to-the-documentation) ## A DevOps development philosophy From 1d7e3e4912ac2b381cb4520612ab69ff0282beac Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Thu, 26 Jan 2023 09:35:45 +0000 Subject: [PATCH 09/16] Update CONTRIBUTING.md Co-authored-by: Jim Madge --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index def0402e23..2b204ef8fd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -220,7 +220,7 @@ You can update your [fork](https://docs.github.com/en/get-started/quickstart/for GitHub has a [nice introduction](https://docs.github.com/en/get-started/quickstart/github-flow) to the pull request workflow, but please [get in touch](#get-in-touch) if you have any questions :balloon:. -### Making a change to documentation +### Making a change to the documentation The docs, including for older releases, are available [here](https://alan-turing-institute.github.io/data-safe-haven). From 6cc29e6dfc67415d119492d6bb714dc6e6d138ca Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Thu, 26 Jan 2023 09:38:19 +0000 Subject: [PATCH 10/16] delete docs link --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 2970efecd4..8ff4c7e4fd 100644 --- a/README.md +++ b/README.md @@ -30,11 +30,6 @@ There are lots of ways to contribute, not just writing code! See our [Code of Conduct](CODE_OF_CONDUCT.md) and our [Contributor Guide](CONTRIBUTING.md) to learn more about how we work together as a community and how you can contribute. -## :book: Documentation - -Full documentation is available at the [Data Safe Haven website](https://alan-turing-institute.github.io/data-safe-haven). -If you think anything there is unclear, please consider reading how to contribute a documentation change in our [Contributor Guide](CONTRIBUTING.md#making-a-change-to-documentation). - ## :cake: Releases If you're new to the project, why not check out our [latest release](https://github.com/alan-turing-institute/data-safe-haven/releases/latest)? From bfaae43b22a3b687096352c39ade0546fd293883 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Thu, 26 Jan 2023 13:08:42 +0000 Subject: [PATCH 11/16] :bug: Switch blobfuse caches to be 2% of the OS disk size --- .../cloud_init/cloud-init-srd.mustache.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml b/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml index 67daace3d2..91ccd18d14 100644 --- a/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml +++ b/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml @@ -415,7 +415,7 @@ write_files: BLOBFUSE_CACHE_DIR="/tmp/blobfuse-cache-backup" rm -rf $BLOBFUSE_CACHE_DIR mkdir -p $BLOBFUSE_CACHE_DIR - CACHE_SPACE_MB=$(echo "$(df -BM | grep /mnt | awk '{print $2}' | sed 's/M//') / 2" | bc) # set the cache size to half the size of /mnt which scales with VM size + CACHE_SPACE_MB=$(echo "$(df -BM | grep /dev/root | awk '{print $2}' | sed 's/M//') / 50" | bc) # set the cache size to 2% of the OS disk size /usr/bin/blobfuse $1 -o rw --tmp-path=$BLOBFUSE_CACHE_DIR --cache-size-mb=$CACHE_SPACE_MB --no-symlinks=true --config-file=/opt/configuration/credentials-backup.secret --log-level=LOG_DEBUG -o attr_timeout=240 -o entry_timeout=240 -o negative_timeout=120 -o allow_other fi @@ -426,7 +426,7 @@ write_files: BLOBFUSE_CACHE_DIR="/tmp/blobfuse-cache-egress" rm -rf $BLOBFUSE_CACHE_DIR mkdir -p $BLOBFUSE_CACHE_DIR - CACHE_SPACE_MB=$(echo "$(df -BM | grep /mnt | awk '{print $2}' | sed 's/M//') / 2" | bc) # set the cache size to half the size of /mnt which scales with VM size + CACHE_SPACE_MB=$(echo "$(df -BM | grep /dev/root | awk '{print $2}' | sed 's/M//') / 50" | bc) # set the cache size to 2% of the OS disk size /usr/bin/blobfuse $1 -o rw --tmp-path=$BLOBFUSE_CACHE_DIR --cache-size-mb=$CACHE_SPACE_MB --no-symlinks=true --config-file=/opt/configuration/credentials-egress.secret --log-level=LOG_DEBUG -o attr_timeout=240 -o entry_timeout=240 -o negative_timeout=120 -o allow_other fi @@ -437,7 +437,7 @@ write_files: BLOBFUSE_CACHE_DIR="/tmp/blobfuse-cache-ingress" rm -rf $BLOBFUSE_CACHE_DIR mkdir -p $BLOBFUSE_CACHE_DIR - CACHE_SPACE_MB=$(echo "$(df -BM | grep /mnt | awk '{print $2}' | sed 's/M//') / 2" | bc) # set the cache size to half the size of /mnt which scales with VM size + CACHE_SPACE_MB=$(echo "$(df -BM | grep /dev/root | awk '{print $2}' | sed 's/M//') / 50" | bc) # set the cache size to 2% of the OS disk size /usr/bin/blobfuse $1 -o ro --tmp-path=$BLOBFUSE_CACHE_DIR --cache-size-mb=$CACHE_SPACE_MB --no-symlinks=true --config-file=/opt/configuration/credentials-ingress.secret --log-level=LOG_DEBUG -o attr_timeout=240 -o entry_timeout=240 -o negative_timeout=120 -o allow_other fi From e85f6519e0b79938595d3f6468d93d9768326dc1 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Thu, 26 Jan 2023 13:09:03 +0000 Subject: [PATCH 12/16] :bug: Fix shellcheck warnings in drive checking script --- .../scripts/check_drive_mounts.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/deployment/secure_research_environment/remote/secure_research_desktop/scripts/check_drive_mounts.sh b/deployment/secure_research_environment/remote/secure_research_desktop/scripts/check_drive_mounts.sh index 426edd56ed..ece5f457ae 100644 --- a/deployment/secure_research_environment/remote/secure_research_desktop/scripts/check_drive_mounts.sh +++ b/deployment/secure_research_environment/remote/secure_research_desktop/scripts/check_drive_mounts.sh @@ -10,15 +10,16 @@ END="\033[0m" MOUNT_POINTS=("/data" "/home" "/scratch" "/shared" "/output") echo -e "${BLUE}Checking drives are mounted...${END}" for MOUNT_POINT in "${MOUNT_POINTS[@]}"; do - ls ${MOUNT_POINT}/* > /dev/null 2>&1 - if [ "$(mount | grep $MOUNT_POINT)" ]; then + ls "${MOUNT_POINT}"/* > /dev/null 2>&1 + if (mount | grep -q "$MOUNT_POINT"); then echo -e "${BLUE} [o] ${MOUNT_POINT} is mounted...${END}" else echo -e "${RED} [ ] ${MOUNT_POINT} not mounted. Attempting to mount...${END}" - if [ -e /etc/systemd/system/${MOUNT_POINT}.mount ]; then - systemctl start $(echo $MOUNT_POINT | sed 's|/||').mount + MOUNT_UNIT="$(echo "$MOUNT_POINT" | tr -d '/').mount" + if [ -e "/etc/systemd/system/${MOUNT_UNIT}" ]; then + systemctl start "${MOUNT_UNIT}" else - mount $MOUNT_POINT + mount "$MOUNT_POINT" fi fi done @@ -26,10 +27,10 @@ sleep 30 echo -e "${BLUE}Rechecking drives are mounted...${END}" for MOUNT_POINT in "${MOUNT_POINTS[@]}"; do - ls ${MOUNT_POINT}/* > /dev/null 2>&1 - if [ "$(mount | grep $MOUNT_POINT)" ]; then + ls "${MOUNT_POINT}"/* > /dev/null 2>&1 + if (mount | grep -q "$MOUNT_POINT"); then echo -e "${BLUE} [o] ${MOUNT_POINT} is mounted...${END}" - df -h | grep $MOUNT_POINT + df -h | grep "$MOUNT_POINT" else echo -e "${RED} [x] ${MOUNT_POINT} is not currently mounted...${END}" fi From 400e0aed7d1981cecf14f91f68bebb217117c4b9 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Thu, 26 Jan 2023 13:21:20 +0000 Subject: [PATCH 13/16] :arrow_up: Allow Powershell 7.2.8 --- deployment/CheckRequirements.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/CheckRequirements.ps1 b/deployment/CheckRequirements.ps1 index 2e8f24d6d9..f3dce22c3a 100644 --- a/deployment/CheckRequirements.ps1 +++ b/deployment/CheckRequirements.ps1 @@ -9,7 +9,7 @@ Import-Module $PSScriptRoot/common/Logging -Force -ErrorAction Stop # Requirements $PowershellMinVersion = "7.0.0" -$PowershellMaxVersion = "7.2.7" +$PowershellMaxVersion = "7.2.8" $ModuleVersionRequired = @{ "Az.Accounts" = @("ge", "2.9.0") "Az.Automation" = @("ge", "1.7.3") From 89b988cbd3293f176bf913636f00127d7a67ce11 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Thu, 26 Jan 2023 15:57:14 +0000 Subject: [PATCH 14/16] :recycle: Use findmnt to get disk size Co-authored-by: Jim Madge --- .../cloud_init/cloud-init-srd.mustache.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml b/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml index 91ccd18d14..12065238e6 100644 --- a/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml +++ b/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml @@ -415,7 +415,7 @@ write_files: BLOBFUSE_CACHE_DIR="/tmp/blobfuse-cache-backup" rm -rf $BLOBFUSE_CACHE_DIR mkdir -p $BLOBFUSE_CACHE_DIR - CACHE_SPACE_MB=$(echo "$(df -BM | grep /dev/root | awk '{print $2}' | sed 's/M//') / 50" | bc) # set the cache size to 2% of the OS disk size + CACHE_SPACE_MB=$(echo "$(findmnt -nb -o size /) / 1024^2 / 50" | bc) # set the cache size to 2% of the OS disk size /usr/bin/blobfuse $1 -o rw --tmp-path=$BLOBFUSE_CACHE_DIR --cache-size-mb=$CACHE_SPACE_MB --no-symlinks=true --config-file=/opt/configuration/credentials-backup.secret --log-level=LOG_DEBUG -o attr_timeout=240 -o entry_timeout=240 -o negative_timeout=120 -o allow_other fi @@ -426,7 +426,7 @@ write_files: BLOBFUSE_CACHE_DIR="/tmp/blobfuse-cache-egress" rm -rf $BLOBFUSE_CACHE_DIR mkdir -p $BLOBFUSE_CACHE_DIR - CACHE_SPACE_MB=$(echo "$(df -BM | grep /dev/root | awk '{print $2}' | sed 's/M//') / 50" | bc) # set the cache size to 2% of the OS disk size + CACHE_SPACE_MB=$(echo "$(findmnt -nb -o size /) / 1024^2 / 50" | bc) # set the cache size to 2% of the OS disk size /usr/bin/blobfuse $1 -o rw --tmp-path=$BLOBFUSE_CACHE_DIR --cache-size-mb=$CACHE_SPACE_MB --no-symlinks=true --config-file=/opt/configuration/credentials-egress.secret --log-level=LOG_DEBUG -o attr_timeout=240 -o entry_timeout=240 -o negative_timeout=120 -o allow_other fi @@ -437,7 +437,7 @@ write_files: BLOBFUSE_CACHE_DIR="/tmp/blobfuse-cache-ingress" rm -rf $BLOBFUSE_CACHE_DIR mkdir -p $BLOBFUSE_CACHE_DIR - CACHE_SPACE_MB=$(echo "$(df -BM | grep /dev/root | awk '{print $2}' | sed 's/M//') / 50" | bc) # set the cache size to 2% of the OS disk size + CACHE_SPACE_MB=$(echo "$(findmnt -nb -o size /) / 1024^2 / 50" | bc) # set the cache size to 2% of the OS disk size /usr/bin/blobfuse $1 -o ro --tmp-path=$BLOBFUSE_CACHE_DIR --cache-size-mb=$CACHE_SPACE_MB --no-symlinks=true --config-file=/opt/configuration/credentials-ingress.secret --log-level=LOG_DEBUG -o attr_timeout=240 -o entry_timeout=240 -o negative_timeout=120 -o allow_other fi From 24951259244ffd9dd17357e067ceef2539ef3ddd Mon Sep 17 00:00:00 2001 From: James Robinson Date: Thu, 26 Jan 2023 16:04:06 +0000 Subject: [PATCH 15/16] :recycle: Use findmnt to check whether targets are mounted --- .../secure_research_desktop/scripts/check_drive_mounts.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/secure_research_environment/remote/secure_research_desktop/scripts/check_drive_mounts.sh b/deployment/secure_research_environment/remote/secure_research_desktop/scripts/check_drive_mounts.sh index ece5f457ae..eb1a7b606c 100644 --- a/deployment/secure_research_environment/remote/secure_research_desktop/scripts/check_drive_mounts.sh +++ b/deployment/secure_research_environment/remote/secure_research_desktop/scripts/check_drive_mounts.sh @@ -11,7 +11,7 @@ MOUNT_POINTS=("/data" "/home" "/scratch" "/shared" "/output") echo -e "${BLUE}Checking drives are mounted...${END}" for MOUNT_POINT in "${MOUNT_POINTS[@]}"; do ls "${MOUNT_POINT}"/* > /dev/null 2>&1 - if (mount | grep -q "$MOUNT_POINT"); then + if (findmnt "$MOUNT_POINT" > /dev/null 2>&1); then echo -e "${BLUE} [o] ${MOUNT_POINT} is mounted...${END}" else echo -e "${RED} [ ] ${MOUNT_POINT} not mounted. Attempting to mount...${END}" @@ -28,7 +28,7 @@ sleep 30 echo -e "${BLUE}Rechecking drives are mounted...${END}" for MOUNT_POINT in "${MOUNT_POINTS[@]}"; do ls "${MOUNT_POINT}"/* > /dev/null 2>&1 - if (mount | grep -q "$MOUNT_POINT"); then + if (findmnt "$MOUNT_POINT" > /dev/null 2>&1); then echo -e "${BLUE} [o] ${MOUNT_POINT} is mounted...${END}" df -h | grep "$MOUNT_POINT" else From 440d31e42a702bf7798ffd224b9111276c1784b9 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Fri, 27 Jan 2023 15:44:24 +0000 Subject: [PATCH 16/16] :memo: Note that v4.0.3 was used for February 2023 Turing DSG --- VERSIONING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/VERSIONING.md b/VERSIONING.md index 5bf727bda2..203a10a1ff 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -63,6 +63,7 @@ We usually deploy the latest available version of the Data Safe Haven for each o | June 2020 | DSSG 2020 | [v3.0.0-beta](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v3.0.0-beta) | | December 2021 | DSG 2021-12 | [v3.3.1](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v3.3.1) | | December 2022 | DSG 2022-12 | [v4.0.2](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v4.0.2) | +| February 2023 | DSG 2023-02 | [v4.0.3](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v4.0.3) | ## Versions that have undergone formal security evaluation