diff --git a/data/common.yaml b/data/common.yaml index ed97d53..2fbf0ff 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -1 +1 @@ ---- +--- {} diff --git a/manifests/config.pp b/manifests/config.pp index e9ce50e..8a76916 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -243,7 +243,7 @@ } exec { 'database migration': - onlyif => "${venv_dir}/bin/python3 netbox/manage.py showmigrations | grep '\[ \]'", + onlyif => "${venv_dir}/bin/python3 netbox/manage.py showmigrations | grep '\\[ \\]'", command => "${venv_dir}/bin/python3 netbox/manage.py migrate --no-input", require => File[$config_file], notify => Exec['collect static files'], diff --git a/manifests/database.pp b/manifests/database.pp index 4725b51..6679883 100644 --- a/manifests/database.pp +++ b/manifests/database.pp @@ -37,7 +37,7 @@ postgresql::server::db { $database_name: user => $database_user, - password => postgresql_password($database_name, $database_password), + password => postgresql::postgresql_password($database_name, $database_password), } postgresql::server::database_grant { 'user_ALL_on_database':