removed BASTION_HOST_REMOTE. if a ProxyJump is needed, it should be set in DEST_HOST's .ssh/config

Author: TimidRobot

README.md

@@ -31,7 +31,7 @@ See [`CONTRIBUTING.md`](CONTRIBUTING.md).
       - `wp-config.php` is already setup
       - user has appopriate permissions (ex. member of `www-data`)
       - [WP-CLI][wp-cli] is already installed
-   2. You may need to configure your users `.ssh/config`. For example,
+   2. You may need to configure your `.ssh/config`. For example,
       `chapters_stage` requires the following entry:
         ```
         Host 10.22.10.14
@@ -50,15 +50,15 @@ See [`CONTRIBUTING.md`](CONTRIBUTING.md).
 ## Use
 
 1. `SOURCE_HOST`: *(optional)*
-   - run [`backup_wordpress.sh`][backup] on the
+   - run [`backup_wordpress.sh`][backup]
 2. Local/laptop:
    1. Clone this repository
    2. Prepare configuration file
       1. Make a copy of one of the appropriate
          [`config_examples/`](config_examples/)
       2. Replace `FILEPATH` and `USERNAME` with your information
       3. Ensure `SOURCE_DB_FILE` and `SOURCE_UPLOADS_FILE` are valid files on
-         the `SOURCE_HOST`.
+         the `SOURCE_HOST` (ex. by completing step 1, above)
    3. Execute script with config file as only argument. For example:
         ```shell
         ./wp-pull.sh chapters__stage

bin/wp-pull-remote.sh

@@ -201,8 +201,7 @@ import_database() {
 
 pull_data() {
     headerone 'DEST_HOST: Pulling data from SOURCE_HOST_REMOTE'
-    scp -oProxyJump=${BASTION_HOST_REMOTE} \
-        ${SOURCE_HOST_REMOTE}:${SOURCE_DB_FILE} \
+    scp ${SOURCE_HOST_REMOTE}:${SOURCE_DB_FILE} \
         ${SOURCE_HOST_REMOTE}:${SOURCE_UPLOADS_FILE} \
         ${TEMP_DIR}/
     PULLED_DB_FILE="${TEMP_DIR}/${SOURCE_DB_FILE##*/}"

config_examples/chapters__stage

@@ -4,7 +4,6 @@
 # DEST_UPLOADS_DIR: /var/www/chapters/wp-content/uploads
 # DEST_TEMP_DIR: /var/www/chapters
 # DEST_WP_DIR: /var/www/chapters/wp
-# BASTION_HOST_REMOTE: 10.22.10.10
 # SOURCE_HOST_REMOTE: 10.22.10.14
 # SOURCE_DOMAIN: creativecommons.net
 # SOURCE_DB_FILE: /var/www/chapters/backup/now/db.sql.gz

wp-pull.sh

@@ -23,8 +23,6 @@ Configuration File Variables:
                             destination host (will be destroyed and replaced)
     DEST_WP_DIR             Absolute path of WordPress directory (where to run
                             WP-CLI from)
-    BASTION_HOST_REMOTE     Bastion or Jump Host used to connect to
-                            SOURCE_HOST_REMOTE
     SOURCE_HOST_REMOTE      Host to pull WordPress data from
     SOURCE_DOMAIN           Domain/Site URL of the source WordPress
     SOURCE_DB_FILE          Absolute path of the database file (.sql.gz)
@@ -73,8 +71,6 @@ display_summary_and_confirm(){
     echo "${DKG}DEST_UPLOADS_DIR:${RST}    ${DEST_UPLOADS_DIR}"
     echo "${DKG}DEST_WP_DIR:${RST}         ${DEST_WP_DIR}"
     echo
-    echo "${DKG}BASTION_HOST_REMOTE:${RST} ${BASTION_HOST_REMOTE}"
-    echo
     echo "${DKG}SOURCE_HOST_REMOTE:${RST}  ${SOURCE_HOST_REMOTE}"
     echo "${DKG}SOURCE_DOMAIN:${RST}       ${SOURCE_DOMAIN}"
     echo "${DKG}SOURCE_DB_FILE:${RST}      ${SOURCE_DB_FILE}"
@@ -115,7 +111,6 @@ execute_remote_script() {
         export DEST_UPLOADS_DIR=\"${DEST_UPLOADS_DIR}\"
         export DEST_TEMP_DIR=\"${DEST_TEMP_DIR}\"
         export DEST_WP_DIR=\"${DEST_WP_DIR}\"
-        export BASTION_HOST_REMOTE=\"${BASTION_HOST_REMOTE}\"
         export SOURCE_HOST_REMOTE=\"${SOURCE_HOST_REMOTE}\"
         export SOURCE_DOMAIN=\"${SOURCE_DOMAIN}\"
         export SOURCE_DB_FILE=\"${SOURCE_DB_FILE}\"
@@ -134,7 +129,6 @@ extract_variables_from_config() {
     DEST_TEMP_DIR="${DEST_TEMP_DIR%/}"
     DEST_WP_DIR="$(awk '/^# DEST_WP_DIR:/ {print $3}' "${_f}")"
     DEST_WP_DIR="${DEST_WP_DIR%/}"
-    BASTION_HOST_REMOTE="$(awk '/^# BASTION_HOST_REMOTE:/ {print $3}' "${_f}")"
     SOURCE_HOST_REMOTE="$(awk '/^# SOURCE_HOST_REMOTE:/ {print $3}' "${_f}")"
     SOURCE_DOMAIN="$(awk '/^# SOURCE_DOMAIN:/ {print $3}' "${_f}")"
     SOURCE_DB_FILE="$(awk '/^# SOURCE_DB_FILE:/ {print $3}' "${_f}")"