tv ejabberd: 2.1.13 -> upstream

tv/3modules/ejabberd/config.nix

@@ -1,93 +1,129 @@
-{ config, ... }: with import <stockholm/lib>; let
+with import <stockholm/lib>;
-  cfg = config.tv.ejabberd;
+{ config, ... }: let
 
-  # XXX this is a placeholder that happens to work the default strings.
+  # See https://github.com/processone/ejabberd/blob/master/ejabberd.yml.example
-  toErlang = builtins.toJSON;
+
-in toFile "ejabberd.conf" ''
+  ciphers = concatStringsSep ":" [
-  {loglevel, 3}.
+    "ECDHE-ECDSA-AES256-GCM-SHA384"
-  {hosts, ${toErlang cfg.hosts}}.
+    "ECDHE-RSA-AES256-GCM-SHA384"
-  {listen,
+    "ECDHE-ECDSA-CHACHA20-POLY1305"
-   [
+    "ECDHE-RSA-CHACHA20-POLY1305"
-    {5222, ejabberd_c2s, [
+    "ECDHE-ECDSA-AES128-GCM-SHA256"
-        starttls,
+    "ECDHE-RSA-AES128-GCM-SHA256"
-        {certfile, ${toErlang cfg.certfile.path}},
+    "ECDHE-ECDSA-AES256-SHA384"
-        {access, c2s},
+    "ECDHE-RSA-AES256-SHA384"
-        {shaper, c2s_shaper},
+    "ECDHE-ECDSA-AES128-SHA256"
-        {max_stanza_size, 65536}
+    "ECDHE-RSA-AES128-SHA256"
-             ]},
+  ];
-    {5269, ejabberd_s2s_in, [
+
-           {shaper, s2s_shaper},
+  protocol_options = [
-           {max_stanza_size, 131072}
+    "no_sslv2"
-          ]},
+    "no_sslv3"
-    {5280, ejabberd_http, [
+    "no_tlsv1"
-         captcha,
+    "no_tlsv1_10"
-         http_bind,
+  ];
-         http_poll,
+
-         web_admin
+in /* yaml */ ''
-        ]}
+
-   ]}.
+  access_rules:
-  {s2s_use_starttls, required}.
+    announce:
-  {s2s_certfile, ${toErlang cfg.s2s_certfile.path}}.
+      - allow: admin
-  {auth_method, internal}.
+    local:
-  {shaper, normal, {maxrate, 1000}}.
+      - allow: local
-  {shaper, fast, {maxrate, 50000}}.
+    configure:
-  {max_fsm_queue, 1000}.
+      - allow: admin
-  {acl, local, {user_regexp, ""}}.
+    register:
-  {access, max_user_sessions, [{10, all}]}.
+      - allow
-  {access, max_user_offline_messages, [{5000, admin}, {100, all}]}.
+    s2s:
-  {access, local, [{allow, local}]}.
+      - allow
-  {access, c2s, [{deny, blocked},
+    trusted_network:
-           {allow, all}]}.
+      - allow: loopback
-  {access, c2s_shaper, [{none, admin},
+
-            {normal, all}]}.
+  acl:
-  {access, s2s_shaper, [{fast, all}]}.
+    local:
-  {access, announce, [{allow, admin}]}.
+      user_regexp: ""
-  {access, configure, [{allow, admin}]}.
+    loopback:
-  {access, muc_admin, [{allow, admin}]}.
+      ip:
-  {access, muc_create, [{allow, local}]}.
+        - "127.0.0.0/8"
-  {access, muc, [{allow, all}]}.
+        - "::1/128"
-  {access, pubsub_createnode, [{allow, local}]}.
+        - "::FFFF:127.0.0.1/128"
-  {access, register, [{allow, all}]}.
+
-  {language, "en"}.
+  hosts: ${toJSON config.hosts}
-  {modules,
+
-   [
+  language: "en"
-    {mod_adhoc,    []},
+
-    {mod_announce, [{access, announce}]},
+  listen:
-    {mod_blocking,[]},
+    -
-    {mod_caps,     []},
+      port: 5222
-    {mod_configure,[]},
+      ip: "::"
-    {mod_disco,    []},
+      module: ejabberd_c2s
-    {mod_irc,      []},
+      shaper: c2s_shaper
-    {mod_http_bind, []},
+      certfile: ${toJSON config.certfile.path}
-    {mod_last,     []},
+      ciphers: ${toJSON ciphers}
-    {mod_muc,      [
+      dhfile: ${toJSON config.dhfile.path}
-        {access, muc},
+      protocol_options: ${toJSON protocol_options}
-        {access_create, muc_create},
+      starttls: true
-        {access_persistent, muc_create},
+      starttls_required: true
-        {access_admin, muc_admin}
+      tls: false
-       ]},
+      tls_compression: false
-    {mod_offline,  [{access_max_user_messages, max_user_offline_messages}]},
+      max_stanza_size: 65536
-    {mod_ping,     []},
+    -
-    {mod_privacy,  []},
+      port: 5269
-    {mod_private,  []},
+      ip: "::"
-    {mod_pubsub,   [
+      module: ejabberd_s2s_in
-        {access_createnode, pubsub_createnode},
+      shaper: s2s_shaper
-        {ignore_pep_from_offline, true},
+      max_stanza_size: 131072
-        {last_item_cache, false},
+
-        {plugins, ["flat", "hometree", "pep"]}
+  loglevel: 4
-       ]},
+
-    {mod_register, [
+  modules:
-        {welcome_message, {"Welcome!",
+    mod_adhoc: {}
-               "Hi.\nWelcome to this XMPP server."}},
+    mod_admin_extra: {}
-        {ip_access, [{allow, "127.0.0.0/8"},
+    mod_announce:
-               {deny, "0.0.0.0/0"}]},
+      access: announce
-        {access, register}
+    mod_caps: {}
-       ]},
+    mod_carboncopy: {}
-    {mod_roster,   []},
+    mod_client_state: {}
-    {mod_shared_roster,[]},
+    mod_configure: {}
-    {mod_stats,    []},
+    mod_disco: {}
-    {mod_time,     []},
+    mod_echo: {}
-    {mod_vcard,    []},
+    mod_irc: {}
-    {mod_version,  []}
+    mod_bosh: {}
-   ]}.
+    mod_last: {}
+    mod_offline:
+      access_max_user_messages: max_user_offline_messages
+    mod_ping: {}
+    mod_privacy: {}
+    mod_private: {}
+    mod_register:
+      access_from: deny
+      access: register
+      ip_access: trusted_network
+      registration_watchers: ${toJSON config.registration_watchers}
+    mod_roster: {}
+    mod_shared_roster: {}
+    mod_stats: {}
+    mod_time: {}
+    mod_vcard:
+      search: false
+    mod_version: {}
+    mod_http_api: {}
+
+  s2s_access: s2s
+  s2s_certfile: ${toJSON config.s2s_certfile.path}
+  s2s_ciphers: ${toJSON ciphers}
+  s2s_dhfile: ${toJSON config.dhfile.path}
+  s2s_protocol_options: ${toJSON protocol_options}
+  s2s_tls_compression: false
+  s2s_use_starttls: required
+
+  shaper_rules:
+    max_user_offline_messages:
+      - 5000: admin
+      - 100
+    max_user_sessions: 10
+    c2s_shaper:
+      - none: admin
+      - normal
+    s2s_shaper: fast
 ''

tv/3modules/ejabberd/default.nix

@@ -1,5 +1,17 @@
 { config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
+
   cfg = config.tv.ejabberd;
+
+  gen-dhparam = pkgs.writeDash "gen-dhparam" ''
+    set -efu
+    path=$1
+    bits=2048
+    # TODO regenerate dhfile after some time?
+    if ! test -e "$path"; then
+      ${pkgs.openssl}/bin/openssl dhparam "$bits" > "$path"
+    fi
+  '';
+
 in {
   options.tv.ejabberd = {
     enable = mkEnableOption "tv.ejabberd";
@@ -11,20 +23,36 @@ in {
         source-path = toString <secrets> + "/ejabberd.pem";
       };
     };
+    dhfile = mkOption {
+      type = types.secret-file;
+      default = {
+        path = "${cfg.user.home}/dhparams.pem";
+        owner = cfg.user;
+        source-path = "/dev/null";
+      };
+    };
     hosts = mkOption {
       type = with types; listOf str;
     };
     pkgs.ejabberdctl = mkOption {
       type = types.package;
       default = pkgs.writeDashBin "ejabberdctl" ''
-        set -efu
-        export SPOOLDIR=${shell.escape cfg.user.home}
-        export EJABBERD_CONFIG_PATH=${shell.escape (import ./config.nix args)}
         exec ${pkgs.ejabberd}/bin/ejabberdctl \
+            --config ${toFile "ejabberd.yaml" (import ./config.nix {
+              inherit pkgs;
+              config = cfg;
+            })} \
             --logs ${shell.escape cfg.user.home} \
+            --spool ${shell.escape cfg.user.home} \
             "$@"
       '';
     };
+    registration_watchers = mkOption {
+      type = types.listOf types.str;
+      default = [
+        config.krebs.users.tv.mail
+      ];
+    };
     s2s_certfile = mkOption {
       type = types.secret-file;
       default = cfg.certfile;
@@ -50,12 +78,12 @@ in {
       requires = [ "secret.service" ];
       after = [ "network.target" "secret.service" ];
       serviceConfig = {
-        Type = "oneshot";
+        ExecStartPre = "${gen-dhparam} ${cfg.dhfile.path}";
-        RemainAfterExit = "yes";
+        ExecStart = "${cfg.pkgs.ejabberdctl}/bin/ejabberdctl foreground";
-        PermissionsStartOnly = "true";
+        PermissionsStartOnly = true;
         SyslogIdentifier = "ejabberd";
         User = cfg.user.name;
-        ExecStart = "${cfg.pkgs.ejabberdctl}/bin/ejabberdctl start";
+        TimeoutStartSec = 60;
       };
     };
 

tv/5pkgs/default.nix

@@ -28,10 +28,6 @@ in {
         "$@"
   '';
 
-  ejabberd = callPackage ./ejabberd {
-    erlang = self.erlangR16;
-  };
-
   ff = self.writeDashBin "ff" ''
     exec ${self.firefoxWrapper}/bin/firefox "$@"
   '';

tv/5pkgs/ejabberd/default.nix

@@ -1,28 +0,0 @@
-{stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}:
-
-stdenv.mkDerivation rec {
-  version = "2.1.13";
-  name = "ejabberd-${version}";
-  src = fetchurl {
-    url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "0vf8mfrx7vr3c5h3nfp3qcgwf2kmzq20rjv1h9sk3nimwir1q3d8";
-  };
-  buildInputs = [ expat erlang zlib openssl pam ];
-  patchPhase = ''
-    sed -i \
-      -e "s|erl \\\|${erlang}/bin/erl \\\|" \
-      -e 's|EXEC_CMD=\"sh -c\"|EXEC_CMD=\"${stdenv.shell} -c\"|' \
-      src/ejabberdctl.template
-  '';
-  preConfigure = ''
-    cd src
-  '';
-  configureFlags = ["--enable-pam"];
-
-  meta = {
-    description = "Open-source XMPP application server written in Erlang";
-    license = stdenv.lib.licenses.gpl2;
-    homepage = http://www.ejabberd.im;
-    maintainers = [ lib.maintainers.sander ];
-  };
-}