From ceffb972308b0ab1f078f72d201f499a79922ab8 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 13 Apr 2020 15:19:06 +0200 Subject: [PATCH] Fiddle with database vars wiring --- plays/lib/database.yml | 3 +-- plays/lib/prepare.yml | 4 ++-- plays/post_deploy.yml | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/plays/lib/database.yml b/plays/lib/database.yml index f5086f5..dd00a8a 100644 --- a/plays/lib/database.yml +++ b/plays/lib/database.yml @@ -3,9 +3,8 @@ - name: Run database setup tasks when: db is defined block: - - name: Setup preparatory facts + - name: Setup database facts set_fact: - db_type: "{{ db.type }}" mount_map: mariadb: /var/lib/mysql diff --git a/plays/lib/prepare.yml b/plays/lib/prepare.yml index 8dbefcb..8e5aa5f 100644 --- a/plays/lib/prepare.yml +++ b/plays/lib/prepare.yml @@ -4,6 +4,6 @@ # already (due to the order of the tasks we define for our deployment steps) - name: Export variable placeholders set_fact: - dokku_db_addr: "" - dokku_db_user: "" + dokku_mariadb_db_addr: "dokku-mariadb-{{ app }}" + dokku_mariadb_db_user: "mariadb" dokku_hostname: "{{ lookup('file', '/home/dokku/HOSTNAME') }}" diff --git a/plays/post_deploy.yml b/plays/post_deploy.yml index 3cf3ee1..6a20a79 100644 --- a/plays/post_deploy.yml +++ b/plays/post_deploy.yml @@ -16,8 +16,8 @@ - name: Include certs tasks include: ./lib/certs.yml - - name: Include proxy tasks - include: ./lib/proxy.yml - - name: Include https tasks include: ./lib/https.yml + + - name: Include proxy tasks + include: ./lib/proxy.yml