Merge branch 'master' of github.xdr.accenturefederalcyber.com:mdr-engineering/infrastructure-notes

GitHub Server Notes.md

@@ -61,16 +61,17 @@ I'll open a case with Github too.
 
 The `ghe-backup` servers are instances running `Docker`.
 
-Docker is installed via the `docker` salt state.
+Docker is installed via the `docker` Salt state.
 
 Most backup configuration is managed by the salt `github.backup` state:
-* `/usr/local/github-backup-utils` contains a copy of the [github repository](https://github.com/github/backup-utils)
-* Build of the docker image. Manual command is: `docker build --build-arg=http_proxy=$HTTP_PROXY --build-arg=https_proxy=$HTTPS_PROXY -t github/backup-utils:v3.0.0 .`. You can run this if you get an error when applying the state.
-* A script is run via a cronjob in /etc/cron.d/ghe-backup, which calls the script /root/github-backup.sh. This script calls docker to run the backup.
+* `/usr/local/github-backup-utils` contains a copy of the [github repository](https://github.com/github/backup-utils). Be sure to run `git pull origin master` prior to upgrading/rebuilding the docker image and use the release version in the image tag.
+* Build of the docker image, replace 'vX.y.z' with the backup-utils release version. Manual command is: `docker build --build-arg=http_proxy=$HTTP_PROXY --build-arg=https_proxy=$HTTPS_PROXY -t github/backup-utils:vX.y.z .`. You can run this if you get an error when applying the state.
+* A script is run via a cronjob in `/etc/cron.d/ghe-backup`, which calls the script `/root/github-backup.sh`. This script calls docker to run the backup.
+* You must update the `/root/ghe-backup.sh` script whenever the Docker image is upgraded or tagged differently.
 
 # First time accepting the key
 
-If there is a new github or a new ghe-backup server, you will need to accept the ssh key. To do so, from the ghe-backup server, run:
+If there is a new GitHub or a new ghe-backup server, you will need to accept the SSH key. To do so, from the ghe-backup server, run:
 
 ```
 sudo ssh -p 122 -i /etc/github-backup-utils/.ssh/id_rsa -o UserKnownHostsFile=/etc/github-backup-utils/.ssh/known_hosts github-enterprise-0.pvt.xdrtest.accenturefederalcyber.com -l admin
@@ -80,7 +81,7 @@ and accept the key.
 
 # Restoring
 
-Restoring should be similar to the command called by /root/github-backup.sh, except with a 'ghe-restore' command.
+Restoring should be similar to the command called by /root/github-backup.sh, except with a 'ghe-restore' command. You may need to update the script to use the latest Docker image build/tag.
 
 # Migration Steps to Govcloud: