From a3a6dc2410b4a0258bfd994055a9a465e372d7da Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 7 Jun 2018 00:05:36 +0200
Subject: [PATCH] Improve group vars vault usage for flyspray
---
group_vars/all/vault_flyspray.yml | 19 ++++++++++---------
roles/flyspray/tasks/main.yml | 2 +-
roles/flyspray/templates/flyspray.conf.php.j2 | 4 ++--
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/group_vars/all/vault_flyspray.yml b/group_vars/all/vault_flyspray.yml
index 91f5011da..49c321b14 100644
--- a/group_vars/all/vault_flyspray.yml
+++ b/group_vars/all/vault_flyspray.yml
@@ -1,10 +1,11 @@
$ANSIBLE_VAULT;1.1;AES256
-65323231303666663563393562383135653432366235656632616563363263653964663438326465
-6262313235646666636432393537663937656462386636630a613063343932326230616161633962
-31616435326264663236653330623334396262323237346364396133343466343632643261356131
-3531643963353035380a333830323836663836316662653634336138663464633338366536313232
-66383865663361373935353764643235323933383937636432336537323637386166313131643931
-66326232303439613431333636316531643764356130373866393662346631323433356235353561
-31373466353166306436313038323165636632616661643262666431636131666130333863366532
-32316339303763633039393334626631636166323065663363323163343161626538616131656562
-33326265373763363434353964666135313433653862373865336266323761656432
+34336137303261353363396532396130393264643466333736303563353764346436363836333639
+6632323661613734356364316536366538363435343332310a366432663662363835396366646561
+30663833633330613965343563346337643161306536373864396634333964363762346635306230
+3630363136393861300a636633383465623432626334346261643561383331393161333436613939
+34333734313832666539356162383032313337363661613466383265393230366563343866666432
+37326461343764653533393032666334333232383464303263393965656436343132366538303366
+61643966666535383465633665323264353862393562343933393633633963323836653164363965
+65656161376662343630653632366138653063343935303066616463366663383433353531393934
+33343630333831313366613765343331666236396631616639373937646430646530646337626436
+6237333937623537633636656535356231666466373630313434
diff --git a/roles/flyspray/tasks/main.yml b/roles/flyspray/tasks/main.yml
index 5123b8ecc..bce2cacdc 100644
--- a/roles/flyspray/tasks/main.yml
+++ b/roles/flyspray/tasks/main.yml
@@ -45,7 +45,7 @@
register: db_created
- name: create flyspray db user
- mysql_user: name={{ flyspray_db_user }} password={{ flyspray_db_password }}
+ mysql_user: name={{ flyspray_db_user }} password={{ vault_flyspray_db_password }}
login_host="{{ flyspray_db_host }}" login_password="{{ vault_mariadb_users.root }}"
priv="{{ flyspray_db }}.*:ALL"
no_log: true
diff --git a/roles/flyspray/templates/flyspray.conf.php.j2 b/roles/flyspray/templates/flyspray.conf.php.j2
index d9a4c274b..7fa45a2da 100644
--- a/roles/flyspray/templates/flyspray.conf.php.j2
+++ b/roles/flyspray/templates/flyspray.conf.php.j2
@@ -1,7 +1,7 @@
; <?php die( 'Do not access this page directly.' ); ?>
[general]
-cookiesalt="{{ flyspray_cookie_salt }}"
+cookiesalt="{{ vault_flyspray_cookie_salt }}"
output_buffering="on"
address_rewriting="1"
reminder_daemon="0"
@@ -15,7 +15,7 @@ dbtype="mysqli"
dbhost="{{ flyspray_db_host }}"
dbname="{{ flyspray_db }}"
dbuser="{{ flyspray_db_user }}"
-dbpass="{{ flyspray_db_password }}"
+dbpass="{{ vault_flyspray_db_password }}"
dbprefix="flyspray_"
[attachments]
--
GitLab