diff --git a/README.md b/README.md index 7bb602dbf0dc7197e87d3116388f1cae7ad58fbd..496febe0b04b1ad011aaa2b5ac7671a6a18109af 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ After following GitLab instructions for registering a new GitLab runner, we need to do some extra setup to prepare the runner's account. See the `.gitlab-ci.yml` file for the exact commands that are run for each job. -At the time of writing a runner is registered on the `rain01` server with a +At the time of writing a runner is registered on the `rain03` server with a "shell" executor with everything running under the gitlab-runner user account. ### Add conda to the runner's environment @@ -64,7 +64,7 @@ command is. To enable this we run a onetime command on the runner which initializes a bashrc for the `gitlab-runner` user. ```bash -sudo -u gitlab-runner /home/davidh/miniconda3/bin/conda init bash +sudo -u gitlab-runner /opt/miniforge3_YYYYMMDD/condabin/conda init bash ``` Or where ever conda is installed for this system. This will create a bashrc @@ -74,10 +74,11 @@ is used in the `.gitlab-ci.yml` scripts for creating a build environment. ### GitLab Runner Upload The uploading of the generated website content is done with rsync via SSH. -This currently uses two SSH keys under David Hoese's user account (davidh) -on the `webaccess` server. These keys are restricted to only run the specific -rsync commands used by gitlab-ci. This is configured in the -`~/.ssh/authorized_keys` file: +This currently uses two SSH keys defined in the GitLab CI Variables (via +the web GUI). These are configured under David Hoese's user account (davidh) +on the `webaccess` server in `~/.ssh/authorized_keys`. These keys are +restricted to only run the specific +rsync commands used by gitlab-ci. ```bash command="rsync --server -vulogDtpre.iLsfxC --delete . METOBS_TEST",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa <key> metobs-test upload key