diff options
Diffstat (limited to 'modules/private/ejabberd')
| -rw-r--r-- | modules/private/ejabberd/default.nix | 10 | ||||
| -rw-r--r-- | modules/private/ejabberd/ejabberd.yml | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/modules/private/ejabberd/default.nix b/modules/private/ejabberd/default.nix index 3537c24..382b42d 100644 --- a/modules/private/ejabberd/default.nix +++ b/modules/private/ejabberd/default.nix | |||
| @@ -14,7 +14,7 @@ in | |||
| 14 | }; | 14 | }; |
| 15 | 15 | ||
| 16 | config = lib.mkIf cfg.enable { | 16 | config = lib.mkIf cfg.enable { |
| 17 | security.acme2.certs = { | 17 | security.acme.certs = { |
| 18 | "ejabberd" = config.myServices.certificates.certConfig // { | 18 | "ejabberd" = config.myServices.certificates.certConfig // { |
| 19 | user = "ejabberd"; | 19 | user = "ejabberd"; |
| 20 | group = "ejabberd"; | 20 | group = "ejabberd"; |
| @@ -58,7 +58,7 @@ in | |||
| 58 | text = '' | 58 | text = '' |
| 59 | host_config: | 59 | host_config: |
| 60 | "immae.fr": | 60 | "immae.fr": |
| 61 | domain_certfile: "${config.security.acme2.certs.ejabberd.directory}/full.pem" | 61 | domain_certfile: "${config.security.acme.certs.ejabberd.directory}/full.pem" |
| 62 | auth_method: [ldap] | 62 | auth_method: [ldap] |
| 63 | ldap_servers: ["${config.myEnv.jabber.ldap.host}"] | 63 | ldap_servers: ["${config.myEnv.jabber.ldap.host}"] |
| 64 | ldap_encrypt: tls | 64 | ldap_encrypt: tls |
| @@ -66,8 +66,8 @@ in | |||
| 66 | ldap_password: "${config.myEnv.jabber.ldap.password}" | 66 | ldap_password: "${config.myEnv.jabber.ldap.password}" |
| 67 | ldap_base: "${config.myEnv.jabber.ldap.base}" | 67 | ldap_base: "${config.myEnv.jabber.ldap.base}" |
| 68 | ldap_uids: | 68 | ldap_uids: |
| 69 | - "uid": "%u" | 69 | uid: "%u" |
| 70 | - "immaeXmppUid": "%u" | 70 | immaeXmppUid: "%u" |
| 71 | ldap_filter: "${config.myEnv.jabber.ldap.filter}" | 71 | ldap_filter: "${config.myEnv.jabber.ldap.filter}" |
| 72 | ''; | 72 | ''; |
| 73 | } | 73 | } |
| @@ -81,7 +81,7 @@ in | |||
| 81 | ERLANG_NODE=ejabberd@localhost | 81 | ERLANG_NODE=ejabberd@localhost |
| 82 | ''; | 82 | ''; |
| 83 | configFile = pkgs.runCommand "ejabberd.yml" { | 83 | configFile = pkgs.runCommand "ejabberd.yml" { |
| 84 | certificatePrivateKeyAndFullChain = "${config.security.acme2.certs.ejabberd.directory}/full.pem"; | 84 | certificatePrivateKeyAndFullChain = "${config.security.acme.certs.ejabberd.directory}/full.pem"; |
| 85 | certificateCA = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; | 85 | certificateCA = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; |
| 86 | sql_config_file = config.secrets.fullPaths."ejabberd/psql.yml"; | 86 | sql_config_file = config.secrets.fullPaths."ejabberd/psql.yml"; |
| 87 | host_config_file = config.secrets.fullPaths."ejabberd/host.yml"; | 87 | host_config_file = config.secrets.fullPaths."ejabberd/host.yml"; |
diff --git a/modules/private/ejabberd/ejabberd.yml b/modules/private/ejabberd/ejabberd.yml index 0f678b6..82ac35b 100644 --- a/modules/private/ejabberd/ejabberd.yml +++ b/modules/private/ejabberd/ejabberd.yml | |||
| @@ -69,7 +69,6 @@ s2s_use_starttls: optional | |||
| 69 | s2s_cafile: "@certificateCA@" | 69 | s2s_cafile: "@certificateCA@" |
| 70 | 70 | ||
| 71 | default_db: sql | 71 | default_db: sql |
| 72 | sql_type: pgsql | ||
| 73 | include_config_file: @sql_config_file@ | 72 | include_config_file: @sql_config_file@ |
| 74 | include_config_file: @host_config_file@ | 73 | include_config_file: @host_config_file@ |
| 75 | new_sql_schema: true | 74 | new_sql_schema: true |
| @@ -193,7 +192,6 @@ modules: | |||
| 193 | access_createnode: pubsub_createnode | 192 | access_createnode: pubsub_createnode |
| 194 | plugins: | 193 | plugins: |
| 195 | - "flat" | 194 | - "flat" |
| 196 | - "hometree" | ||
| 197 | - "pep" | 195 | - "pep" |
| 198 | force_node_config: | 196 | force_node_config: |
| 199 | ## Change from "whitelist" to "open" to enable OMEMO support | 197 | ## Change from "whitelist" to "open" to enable OMEMO support |