summaryrefslogtreecommitdiff
path: root/salt/openbook/database
diff options
context:
space:
mode:
authorckonstanski <ckonstanski@pippiandcarlos.com>2017-09-29 21:34:06 -0600
committerckonstanski <ckonstanski@pippiandcarlos.com>2017-09-29 21:34:06 -0600
commitbe60eeda08a819c9d340b18553dd249869bb5fea (patch)
tree45383a104668ab1d3bfa207cec160adaf2bdf7d1 /salt/openbook/database
parent8323e3d84898d6dc2c62680dec2dca457e943bf8 (diff)
.my.cnf
Diffstat (limited to 'salt/openbook/database')
-rw-r--r--salt/openbook/database/files/_my.cnf4
-rw-r--r--salt/openbook/database/files/fix_permissions.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/salt/openbook/database/files/_my.cnf b/salt/openbook/database/files/_my.cnf
index 269e0ba..e158680 100644
--- a/salt/openbook/database/files/_my.cnf
+++ b/salt/openbook/database/files/_my.cnf
@@ -1,6 +1,6 @@
[mysql]
user=root
-password={{ openbook_database_password }}
+password={% raw %}{{ openbook_database_password }}{% endraw %}
[mysqldump]
user=root
-password={{ openbook_database_password }}
+password={% raw %}{{ openbook_database_password }}{% endraw %}
diff --git a/salt/openbook/database/files/fix_permissions.sh b/salt/openbook/database/files/fix_permissions.sh
index 0bf9c64..8e68f92 100644
--- a/salt/openbook/database/files/fix_permissions.sh
+++ b/salt/openbook/database/files/fix_permissions.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+sed -e 's|{% raw %}{{{% endraw %} openbook_database_password {% raw %}}}{% endraw %}|{% raw %}{{ openbook_database_password }}{% endraw %}|g' -i /root/.my.cnf
+
# wait for mysql to start
for i in {120..0}; do
if echo 'SELECT 1' | mysql &>/dev/null; then