From 56f89bb3f7cd6381061f1a3ca1018422217bfb31 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 12 Nov 2022 01:43:14 +0000 Subject: [PATCH] servo: ejabberd: configure, but then disable because broken --- machines/servo/net.nix | 1 + machines/servo/services/ejabberd.nix | 37 ++++++++++++++++++++++++--- machines/servo/services/ejabberd.yaml | 0 3 files changed, 35 insertions(+), 3 deletions(-) delete mode 100644 machines/servo/services/ejabberd.yaml diff --git a/machines/servo/net.nix b/machines/servo/net.nix index 7982dfd4..00fc8528 100644 --- a/machines/servo/net.nix +++ b/machines/servo/net.nix @@ -13,6 +13,7 @@ # networking.firewall.enable = false; networking.firewall.enable = true; + # TODO: split these into the submodules networking.firewall.allowedTCPPorts = [ 25 # SMTP 80 # HTTP diff --git a/machines/servo/services/ejabberd.nix b/machines/servo/services/ejabberd.nix index ce1d098b..bff2c932 100644 --- a/machines/servo/services/ejabberd.nix +++ b/machines/servo/services/ejabberd.nix @@ -2,12 +2,43 @@ # - { lib, ... }: -# TODO: enable -lib.mkIf false { +# XXX disabled: fails to start because of `mnesia_tm` dependency +lib.mkIf false +{ sane.impermanence.service-dirs = [ { user = "ejabberd"; group = "ejabberd"; directory = "/var/lib/ejabberd"; } ]; + networking.firewall.allowedTCPPorts = [ + 5222 # XMPP client -> server + 5269 # XMPP server -> server + ]; # TODO: allocate UIDs/GIDs ? services.ejabberd.enable = true; - services.ejabberd.configFile = ./ejabberd.yaml; + services.ejabberd.configFile = builtins.toFile "ejabberd.yaml" '' + hosts: + - uninsane.org + + # none | emergency | alert | critical | error | warning | notice | info | debug + loglevel: debug + + acme: + auto: false + certfiles: + - /var/lib/acme/uninsane.org/fullchain.pem + - /var/lib/acme/uninsane.org/key.pem + + pam_userinfotype: jid + + # see: + # TODO: host web admin panel + listen: + - + port: 5222 + module: ejabberd_c2s + starttls: true + - + port: 5269 + module: ejabberd_s2s_in + transport: tcp + ''; } diff --git a/machines/servo/services/ejabberd.yaml b/machines/servo/services/ejabberd.yaml deleted file mode 100644 index e69de29b..00000000