Merge branch 'master' into prosody_update

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'

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'

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 }}" }