...

1 files changed, 3 insertions, 27 deletions

diff --git a/ymir.nix b/ymir.nix
index bbc2afd2..04f920fb 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -237,8 +237,7 @@ in rec {
   };
 
   users.groups."ssl" = {
-    members = [ "ejabberd"
-                "nginx"
+    members = [ "nginx"
                 config.services.postfix.user
                 "murmur"
                 "infinoted"
@@ -258,27 +257,6 @@ in rec {
     '';
   };
 
-  services.ejabberd = {
-    enable = false;
-    package = pkgs.ejabberd.override { withPam = true; withTools = true; };
-    configFile = ./ymir/ejabberd.yml;
-  };
-
-  security.pam.services."xmpp".text = ''
-    auth requisite  pam_succeed_if.so user ingroup xmpp
-    auth required   pam_unix.so audit likeauth nullok nodelay
-    account sufficient pam_unix.so
-  '';
-  users.groups."shadow" = {
-    members = [ "ejabberd"
-              ];
-  };
-  users.groups."xmpp" = {};
-  system.activationScripts."shadow-perms" = ''
-    chown root:shadow /etc/shadow
-    chmod 0640 /etc/shadow
-  '';
-
   services.yggdrasilTinc = {
     enable = true;
     connect = false;
@@ -777,7 +755,7 @@ in rec {
           "nights.email" "*.nights.email"
         ];
         postRun = ''
-          systemctl try-reload-or-restart nginx.service dovecot2.service postfix.service ejabberd.service vsftpd.service infinoted.service
+          systemctl try-reload-or-restart nginx.service dovecot2.service postfix.service vsftpd.service infinoted.service
         '';
       };
     };
@@ -944,7 +922,7 @@ in rec {
   '';
 
   systemd.status-mail = {
-    onFailure = [ "nixos-upgrade" "postfix" "dovecot2" "ejabberd" "opendkim" "unbound" "tinc@yggdrasil" "postsrsd" ];
+    onFailure = [ "nixos-upgrade" "postfix" "dovecot2" "opendkim" "unbound" "tinc@yggdrasil" "postsrsd" ];
   };
 
   services.vsftpd = {
@@ -1004,8 +982,6 @@ in rec {
       "postfix-512".bits = 512;
       "postfix-1024".bits = 1024;
       "dovecot2".bits = 2048;
-      "ejabberd-s2s".bits = 2048;
-      "ejabberd-c2s".bits = 2048;
     };
   };