diff options
| author | EuAndreh <eu@euandre.org> | 2019-06-10 23:46:09 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2019-06-10 23:46:09 -0300 |
| commit | b9f9e914c2e4c99aefbdb06332449a5f94a3be98 (patch) | |
| tree | dd22752a16cd8fc6de8fbacad16e37a73c020d04 /scripts | |
| parent | Switch $DESTROY_VOLUME back on (diff) | |
| download | server-b9f9e914c2e4c99aefbdb06332449a5f94a3be98.tar.gz server-b9f9e914c2e4c99aefbdb06332449a5f94a3be98.tar.xz | |
Reorder setup.sh
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ci/setup.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/ci/setup.sh b/scripts/ci/setup.sh index 84958d0..6f5b0c4 100755 --- a/scripts/ci/setup.sh +++ b/scripts/ci/setup.sh @@ -5,10 +5,7 @@ set -Eeuo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" cd ../../ -echo "Unlocking git-crypt repos and configuring git..." -git config --global user.email "${GIT_CI_USER}" -git config --global user.name "sr.ht CI" - +echo "Unlocking git-crypt repos..." git crypt unlock # Assumes vps-state was already cloned pushd ../vps-state/ @@ -17,14 +14,17 @@ git remote set-url origin git@git.sr.ht:~euandreh/vps-state popd echo "Done." -gpg --import "${GPG_TO}.gpg" - # git smudge after git-crypt clears file permissions chmod 400 ./secrets/ssh/vps-box-client cat .envrc >> ~/.buildenv source .envrc +git config --global user.email "${GIT_CI_USER}" +git config --global user.name "sr.ht CI" + +gpg --import "${GPG_TO}.gpg" + envsubst < ./ssh.env.conf >> ~/.ssh/config envsubst < ./hosts.env > ./generated/hosts envsubst < ./docker-compose.env.yaml > ./generated/docker-compose.yaml |