cloudflare: Update ssh commands to use hostnames

Author: jpmckinney

deploy-docs.sh

@@ -6,6 +6,8 @@ set -xeu
 REF="$GITHUB_REF_NAME"
 # The first path component, e.g. "infrastructure" or "profiles".
 COMPONENT="${PATH_PREFIX%%/*}"
+# The hostname, in case of proxy.
+HOST=ocp19.open-contracting.org
 
 # If a git tag or live branch is pushed.
 if [ "$PRODUCTION" = "true" ]; then
@@ -16,12 +18,10 @@ else
     SUFFIX=""
 fi
 
-curl --silent --connect-timeout 1 standard.open-contracting.org:8255 || true
-
 # If a git tag isn't pushed, deploy the build directory from the git branch.
 if [ "$RELEASE" != "true" ]; then
-    curl --silent --connect-timeout 1 standard.open-contracting.org:8255 || true
-    rsync -az --delete-after build/ ocds-docs@standard.open-contracting.org:web/"$PREFIX""$PATH_PREFIX""$REF""$SUFFIX"
+    curl --silent --connect-timeout 1 $HOST:8255 || true
+    rsync -az --delete-after build/ ocds-docs@$HOST:web/"$PREFIX""$PATH_PREFIX""$REF""$SUFFIX"
 
     # Index the build directory.
     ocdsindex sphinx build/ https://standard.open-contracting.org/"$PREFIX""$PATH_PREFIX""$REF"/ > documents.json
@@ -33,9 +33,9 @@ if [ "$RELEASE" != "true" ]; then
 
     if [ "$PRODUCTION" = "true" ]; then
         # Symlink the live directory.
-        curl --silent --connect-timeout 1 standard.open-contracting.org:8255 || true
+        curl --silent --connect-timeout 1 $HOST:8255 || true
         # shellcheck disable=SC2087
-        ssh ocds-docs@standard.open-contracting.org /bin/bash <<- EOF
+        ssh ocds-docs@$HOST /bin/bash <<- EOF
             mkdir -p /home/ocds-docs/web/$PREFIX$PATH_PREFIX
             ln -nfs $REF$SUFFIX /home/ocds-docs/web/$PREFIX$PATH_PREFIX$REF
 		EOF
@@ -49,9 +49,9 @@ else
     fi
 
     # Deploy the schema files, codelist files and metadata file (if any).
-    curl --silent --connect-timeout 1 standard.open-contracting.org:8255 || true
+    curl --silent --connect-timeout 1 $HOST:8255 || true
     # shellcheck disable=SC2087
-    ssh ocds-docs@standard.open-contracting.org /bin/bash <<- EOF
+    ssh ocds-docs@$HOST /bin/bash <<- EOF
         mkdir -p /home/ocds-docs/web/"$PATH_PREFIX""$DIRECTORY"/"$REF"/
         cp -r /home/ocds-docs/web/"$PATH_PREFIX""$VERSION"/en/*.json /home/ocds-docs/web/"$PATH_PREFIX""$DIRECTORY"/"$REF"/
         cp -r /home/ocds-docs/web/"$PATH_PREFIX""$VERSION"/en/codelists /home/ocds-docs/web/"$PATH_PREFIX""$DIRECTORY"/"$REF"/

docs/use/kingfisher.rst

@@ -32,7 +32,7 @@ Connect to the data support server, replacing ``USER``:
 
 .. code-block:: bash
 
-   ssh USER@collect.kingfisher.open-contracting.org
+   ssh USER@ocp23.open-contracting.org
 
 In addition to the Kingfisher tools, users have access to these command-line tools:
 

docs/use/ssh.rst

@@ -9,7 +9,7 @@ On machines running Docker, use SSH as usual. For example:
 
 .. code-block:: bash
 
-   ssh USER@collect.kingfisher.open-contracting.org
+   ssh USER@ocp42.open-contracting.org
 
 On machines not running Docker, the SSH port is closed by default. The easiest way to open it depends on whether your IP address is dynamic or static.
 
@@ -20,7 +20,7 @@ To open the SSH port for 30 seconds, send traffic to port 8255, replacing ``exam
 
 .. code-block:: bash
 
-   curl --silent --connect-timeout 1 example.open-contracting.org:8255 || true
+   curl --silent --connect-timeout 1 ocp42.open-contracting.org:8255 || true
 
 You can then use ``ssh`` as usual. Once you're connected, the server will close the port, but not your connection.