From dafb96637ffd39e92770d68b06ee3991f45cf8b1 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Tue, 16 Feb 2021 18:21:19 +0100
Subject: [PATCH] added vault for secret and fixed public address

---
 inventory/group_vars/prod_cluster.yaml           | 2 +-
 roles/external-postgres/defaults/main.yml        | 1 -
 roles/external-postgres/defaults/plain_main.yaml | 1 +
 roles/external-postgres/defaults/vault_main.yaml | 7 +++++++
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 roles/external-postgres/defaults/plain_main.yaml
 create mode 100644 roles/external-postgres/defaults/vault_main.yaml

diff --git a/inventory/group_vars/prod_cluster.yaml b/inventory/group_vars/prod_cluster.yaml
index 9985460..1cb1f83 100644
--- a/inventory/group_vars/prod_cluster.yaml
+++ b/inventory/group_vars/prod_cluster.yaml
@@ -1,3 +1,3 @@
 ---
 infrastructure: prod
-conductor_workers_server: https://conductor.prod.d4science.org/api 
+conductor_workers_server: https://conductor.d4science.org/api 
diff --git a/roles/external-postgres/defaults/main.yml b/roles/external-postgres/defaults/main.yml
index 51ce107..8be8f28 100644
--- a/roles/external-postgres/defaults/main.yml
+++ b/roles/external-postgres/defaults/main.yml
@@ -3,7 +3,6 @@ use_jdbc: True
 postgres_host: "postgresql-srv.d4science.org"
 conductor_db: "postgres" 
 jdbc_user: "conductor_u"
-jdbc_pass: "c36dda661add7c2b5093087ddb655992"
 jdbc_db: "conductor"
 jdbc_url: "jdbc:postgresql://{{ postgres_host }}:5432/{{ jdbc_db }}"
 
diff --git a/roles/external-postgres/defaults/plain_main.yaml b/roles/external-postgres/defaults/plain_main.yaml
new file mode 100644
index 0000000..a185a28
--- /dev/null
+++ b/roles/external-postgres/defaults/plain_main.yaml
@@ -0,0 +1 @@
+#jdbc_pass: "secret"
diff --git a/roles/external-postgres/defaults/vault_main.yaml b/roles/external-postgres/defaults/vault_main.yaml
new file mode 100644
index 0000000..3509876
--- /dev/null
+++ b/roles/external-postgres/defaults/vault_main.yaml
@@ -0,0 +1,7 @@
+$ANSIBLE_VAULT;1.1;AES256
+39303332663366633565666361663463353562636165643464313163633432373339633735656333
+3331323435653762303366303238333835623762313133360a646466383563383832313662356239
+32353134636636393433663638383639396365373736383135363133656161336165373864363566
+3831666263643664320a386632666439306337383139613861353534313334303065303164616231
+65343235343065383734643239666266626432393839656334383462336533383865646662646636
+6333633164653139653337356135353264376363353532313536