diff options
| author | EuAndreh <eu@euandre.org> | 2019-06-11 00:06:01 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2019-06-11 00:06:01 -0300 |
| commit | 294b1f125b8d7c1970e6d1f75329f307179422fa (patch) | |
| tree | f6aa44ebcf1da8aa8fa7f23e4841235ff5f6f0e9 | |
| parent | Set the directory before sourcing (diff) | |
| download | server-294b1f125b8d7c1970e6d1f75329f307179422fa.tar.gz server-294b1f125b8d7c1970e6d1f75329f307179422fa.tar.xz | |
Move envsubst calls out of setup.sh into deploy.sh
| -rwxr-xr-x | scripts/ci/deploy.sh | 9 | ||||
| -rwxr-xr-x | scripts/ci/setup.sh | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/scripts/ci/deploy.sh b/scripts/ci/deploy.sh index 7fcfda7..52971d2 100755 --- a/scripts/ci/deploy.sh +++ b/scripts/ci/deploy.sh @@ -25,6 +25,15 @@ create_known_hosts_file() { echo "${TLD},$(terraform output public_floating_ip) ssh-rsa $(awk '{print $2}' < ./secrets/ssh/vps-box-server.pub)" > ./generated/generated-known-hosts.txt } +echo "Interpolating files with envsubst..." +envsubst < ./ssh.env.conf >> ~/.ssh/config +envsubst < ./hosts.env > ./generated/hosts +envsubst < ./docker-compose.env.yaml > ./generated/docker-compose.yaml +envsubst < ./scripts/box/user-data.env.sh > ./generated/user-data.sh +envsubst < ./scripts/box/create-backup.env.sh > ./generated/create-backup.sh +envsubst < ./scripts/box/restore-backup.env.sh > ./generated/restore-backup.sh +echo "Done." + echo "Shutting down running containers and backing up data..." create_known_hosts_file ssh "$TLD" "cd /home/vps/ && docker-compose down" diff --git a/scripts/ci/setup.sh b/scripts/ci/setup.sh index a21ce47..0b2906f 100755 --- a/scripts/ci/setup.sh +++ b/scripts/ci/setup.sh @@ -24,10 +24,3 @@ git config --global user.email "${GIT_CI_USER}" git config --global user.name "sr.ht CI" gpg --quiet --import "${GPG_TO}.gpg" - -envsubst < ./ssh.env.conf >> ~/.ssh/config -envsubst < ./hosts.env > ./generated/hosts -envsubst < ./docker-compose.env.yaml > ./generated/docker-compose.yaml -envsubst < ./scripts/box/user-data.env.sh > ./generated/user-data.sh -envsubst < ./scripts/box/create-backup.env.sh > ./generated/create-backup.sh -envsubst < ./scripts/box/restore-backup.env.sh > ./generated/restore-backup.sh |