diff options
| author | EuAndreh <eu@euandre.org> | 2020-08-02 19:03:25 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2020-08-02 19:03:58 -0300 |
| commit | cf61d10caeae36bd4ce5d10eb075408b5a58dc8b (patch) | |
| tree | f370d60ea17e843cbf73757ffab4d09d82896b5f | |
| parent | provision.env.yaml: Tweak relative paths (diff) | |
| download | server-cf61d10caeae36bd4ce5d10eb075408b5a58dc8b.tar.gz server-cf61d10caeae36bd4ce5d10eb075408b5a58dc8b.tar.xz | |
Revert "provision.env.yaml: Tweak relative paths"
This reverts commit cb15c40682b990697087380e102cd39fca47f6d9.
Instead of the previous solution, copy the provision.yaml file before running
the Ansible playbook.
| -rw-r--r-- | provision.env.yaml | 12 | ||||
| -rwxr-xr-x | scripts/ci/deploy.sh | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/provision.env.yaml b/provision.env.yaml index 0f7ef23..07fd3f0 100644 --- a/provision.env.yaml +++ b/provision.env.yaml @@ -29,12 +29,12 @@ - name: Copy local interpolated files to remote copy: src={{ item.src }} dest={{ item.dest }} mode={{ item.mode }} with_items: - - { src: './restore-backup.sh', dest: '/home/vps/restore-backup.sh', mode: '500' } - - { src: '../secrets/borg/borg-remote.pub', dest: '/root/.ssh/id_rsa.pub', mode: '400' } - - { src: '../secrets/borg/borg-remote', dest: '/root/.ssh/id_rsa', mode: '400' } - - { src: '../secrets/borg/known-hosts.txt', dest: '/root/.ssh/known_hosts', mode: '400' } - - { src: '../scripts/box/bash-profile.sh', dest: '/root/.bash_profile', mode: '400' } - - { src: './docker-compose.yaml', dest: '/home/vps/docker-compose.yaml', mode: '400' } + - { src: './generated/restore-backup.sh', dest: '/home/vps/restore-backup.sh', mode: '500' } + - { src: './secrets/borg/borg-remote.pub', dest: '/root/.ssh/id_rsa.pub', mode: '400' } + - { src: './secrets/borg/borg-remote', dest: '/root/.ssh/id_rsa', mode: '400' } + - { src: './secrets/borg/known-hosts.txt', dest: '/root/.ssh/known_hosts', mode: '400' } + - { src: './scripts/box/bash-profile.sh', dest: '/root/.bash_profile', mode: '400' } + - { src: './generated/docker-compose.yaml', dest: '/home/vps/docker-compose.yaml', mode: '400' } - name: Restore borg backup when we have a fresh volume shell: /home/vps/restore-backup.sh when: lookup('env', 'DESTROY_VOLUME') == "1" diff --git a/scripts/ci/deploy.sh b/scripts/ci/deploy.sh index 1a7e400..0383911 100755 --- a/scripts/ci/deploy.sh +++ b/scripts/ci/deploy.sh @@ -100,5 +100,6 @@ echo "Done." echo "Running the Ansible provision.yaml playbook..." create-known-hosts-file -ansible-playbook -v ./generated/provision.yaml > ./logs/ansible-provision.txt +mv ./generated/provision.yaml ./provision.yaml +ansible-playbook -v provision.yaml > ./logs/ansible-provision.txt echo "Done." |