diff options
| -rw-r--r-- | pillar/openbook/database.sls | 2 | ||||
| -rw-r--r-- | salt/openbook/database/files/_my.cnf | 4 | ||||
| -rw-r--r-- | salt/openbook/database/files/fix_permissions.sh | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/pillar/openbook/database.sls b/pillar/openbook/database.sls index 361c2e6..36b7ad1 100644 --- a/pillar/openbook/database.sls +++ b/pillar/openbook/database.sls @@ -86,7 +86,7 @@ database: path: /root source: _my.cnf mode: "0644" - is_template: False + is_template: True relative_to_buildroot: False ansible: True _my_cnf: 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 |