diff --git a/defaults/main.yml b/defaults/main.yml index 09a64e5..bb744c4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -44,7 +44,7 @@ prosody_http_external_url: "https://example.org" prosody_archive_expires_after: '1w' #If using sql storage -prosody_sql_driver: 'sqlite3' # postgresql sqlite3 or mysql +prosody_sql_driver: 'SQLite3' # postgresql sqlite3 or mysql prosody_sql_databasename: 'prosody' prosody_sql_username: 'admin' prosody_sql_passwd: 'changeme' diff --git a/tasks/install.yml b/tasks/install.yml index 570700f..df42428 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -18,7 +18,7 @@ - 'lua-cyrussasl' - 'lua-dbi-common' - 'lua-dbi-mysql' - - 'lua-dbi-{{ prosody_sql_driver }}' + - 'lua-dbi-{{ prosody_sql_driver | lower }}' - 'lua-event' - 'lua-ldap' - 'lua-sec' diff --git a/templates/etc/prosody/prosody.cfg.lua.j2 b/templates/etc/prosody/prosody.cfg.lua.j2 index 40a8916..51e02ae 100644 --- a/templates/etc/prosody/prosody.cfg.lua.j2 +++ b/templates/etc/prosody/prosody.cfg.lua.j2 @@ -150,7 +150,7 @@ storage = "{{ prosody_storage }}" --sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename. --sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } --sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } -{% if prosody_sql_driver == 'sqlite3' %} +{% if prosody_sql_driver == 'SQLite3' %} sql = { driver = "{{ prosody_sql_driver }}", database = "{{ prosody_sql_databasename }}" } {% else %} sql = { driver = "{{ prosody_sql_driver }}", database = "{{ prosody_sql_databasename }}", username = "{{ prosody_sql_username }}", password = "{{ prosody_sql_passwd }}", host = "{{ prosody_sql_host }}" }