Configure mod_vcard for tests with dynamic domains

esl · Aug 31, 2021 · a475d8f · a475d8f
1 parent 3e61c13
commit a475d8f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/big_tests/test.config b/big_tests/test.config
@@ -259,8 +259,7 @@
       {mod_private, "[modules.mod_private]
   backend = \"rdbms\""},
       {mod_offline, "  backend = \"rdbms\"\n"},
-      {mod_vcard, "[modules.mod_vcard]
-  backend = \"rdbms\"
+      {mod_vcard, "  backend = \"rdbms\"
   host = \"vjud.@HOST@\""},
       {mod_roster, "  backend = \"rdbms\"\n"}]},
     {odbc_mssql_mnesia,
@@ -280,8 +279,7 @@
       {mod_private, "[modules.mod_private]
   backend = \"rdbms\""},
       {mod_offline, "  backend = \"rdbms\"\n"},
-      {mod_vcard, "[modules.mod_vcard]
-  backend = \"rdbms\"
+      {mod_vcard, "  backend = \"rdbms\"
   host = \"vjud.@HOST@\""},
       {mod_roster, "  backend = \"rdbms\"\n"}]},
     {mysql_redis,
@@ -311,8 +309,7 @@
       {mod_private, "[modules.mod_private]
   backend = \"rdbms\""},
       {mod_offline, "  backend = \"rdbms\"\n"},
-      {mod_vcard, "[modules.mod_vcard]
-  backend = \"rdbms\"
+      {mod_vcard, "  backend = \"rdbms\"
   host = \"vjud.@HOST@\""},
       {mod_roster, "  backend = \"rdbms\"\n"}]},
     {ldap_mnesia,
@@ -346,8 +343,7 @@
       {password_format, "password.format = \"scram\""},
       {auth_ldap, "ldap.base = \"ou=Users,dc=esl,dc=com\"
   ldap.filter = \"(objectClass=inetOrgPerson)\""},
-      {mod_vcard, "[modules.mod_vcard]
-  backend = \"ldap\"
+      {mod_vcard, "  backend = \"ldap\"
   host = \"vjud.@HOST@\"
   ldap_base = \"ou=Users,dc=esl,dc=com\"
   ldap_filter = \"(objectClass=inetOrgPerson)\""}]},
@@ -378,8 +374,7 @@
       {mod_private, "[modules.mod_private]
   backend = \"riak\""},
       {mod_offline, "  backend = \"riak\"\n"},
-      {mod_vcard, "[modules.mod_vcard]
-  backend = \"riak\"
+      {mod_vcard, "  backend = \"riak\"
   host = \"vjud.@HOST@\""},
       {mod_roster, "  backend = \"riak\"\n"}
      ]},

diff --git a/rel/files/mongooseim.toml b/rel/files/mongooseim.toml
@@ -266,8 +266,8 @@
 [modules.mod_sic]
 
 {{#mod_vcard}}
+[modules.mod_vcard]
 {{{mod_vcard}}}
-
 {{/mod_vcard}}
 [modules.mod_bosh]
 

diff --git a/rel/mim1.vars-toml.config b/rel/mim1.vars-toml.config
@@ -52,7 +52,11 @@
   {{#mod_blocking}}
   [host_config.modules.mod_blocking]
   {{{mod_blocking}}}
-  {{/mod_blocking}}"}.
+  {{/mod_blocking}}
+  {{#mod_vcard}}
+  [host_config.modules.mod_vcard]
+  {{{mod_vcard}}}
+  {{/mod_vcard}}"}.
 {password_format, "password.format = \"scram\"
   password.hash = [\"sha256\"]"}.
 {scram_iterations, 64}.

diff --git a/rel/vars-toml.config.in b/rel/vars-toml.config.in
@@ -28,8 +28,7 @@
 {mod_blocking, ""}.
 {mod_private, "[modules.mod_private]"}.
 {mod_roster, ""}.
-{mod_vcard, "[modules.mod_vcard]
-  host = \"vjud.@HOST@\""}.
+{mod_vcard, "  host = \"vjud.@HOST@\""}.
 {sm_backend, "\"mnesia\""}.
 {auth_method, "\"internal\""}.
 {cyrsasl_external, "\"standard\""}.