aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2020-08-02 18:56:57 -0300
committerEuAndreh <eu@euandre.org>2020-08-02 18:56:57 -0300
commitace77b57ebf749bbd746806e066fa58bbdf230e6 (patch)
treeed00d342255cdf45b2b0ce4c26f0e35d4ea071cc
parentprovision.yaml: Create the docker network before starting docker-compose (diff)
downloadserver-ace77b57ebf749bbd746806e066fa58bbdf230e6.tar.gz
server-ace77b57ebf749bbd746806e066fa58bbdf230e6.tar.xz
provision.yaml: Use environment value of VPS_VOLUME_NAME
-rw-r--r--provision.env.yaml (renamed from provision.yaml)2
-rwxr-xr-xscripts/ci/deploy.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/provision.yaml b/provision.env.yaml
index a202d7f..07fd3f0 100644
--- a/provision.yaml
+++ b/provision.env.yaml
@@ -23,7 +23,7 @@
state: directory
- name: Create symlink to attached volume
file:
- src: /mnt/vps_persistent_volume
+ src: /mnt/${VPS_VOLUME_NAME}
dest: /home/vps/volumes
state: link
- name: Copy local interpolated files to remote
diff --git a/scripts/ci/deploy.sh b/scripts/ci/deploy.sh
index d3b9dac..1a7e400 100755
--- a/scripts/ci/deploy.sh
+++ b/scripts/ci/deploy.sh
@@ -49,6 +49,7 @@ 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 < ./provision.env.yaml > ./generated/provision.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
@@ -99,5 +100,5 @@ echo "Done."
echo "Running the Ansible provision.yaml playbook..."
create-known-hosts-file
-ansible-playbook -v provision.yaml > ./logs/ansible-provision.txt
+ansible-playbook -v ./generated/provision.yaml > ./logs/ansible-provision.txt
echo "Done."