2 files changed, 19 insertions, 5 deletions
diff --git a/krebs/3modules/ergo.nix b/krebs/3modules/ergo.nix
index 3153e4cf..50c5ab62 100644
--- a/krebs/3modules/ergo.nix
+++ b/krebs/3modules/ergo.nix
@@ -2,6 +2,13 @@
   options = {
     krebs.ergo = {
       enable = lib.mkEnableOption "Ergo IRC daemon";
+      openFilesLimit = lib.mkOption {
+        type = lib.types.int;
+        default = 1024;
+        description = ''
+          Maximum number of open files. Limits the clients and server connections.
+        '';
+      };
       config = lib.mkOption {
         type = (pkgs.formats.json {}).type;
         description = ''
@@ -54,8 +61,8 @@
             multiclient = {
               enabled = true;
               allowed-by-default = true;
-              always-on = "opt-in";
-              auto-away = "opt-in";
+              always-on = "opt-out";
+              auto-away = "opt-out";
             };
           };
           channels = {
@@ -111,13 +118,15 @@
     systemd.services.ergo = {
       description = "Ergo IRC daemon";
       wantedBy = [ "multi-user.target" ];
-      reloadIfChanged = true;
+      # reload currently not working as expected
+      # reloadIfChanged = true;
       restartTriggers = [ configFile ];
       serviceConfig = {
         ExecStart = "${pkgs.ergo}/bin/ergo run --conf /etc/ergo.yaml";
         ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
         DynamicUser = true;
         StateDirectory = "ergo";
+        LimitNOFILE = "${toString cfg.openFilesLimit}";
       };
     };
   });
diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index 349a6c34..cd11fb2c 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -526,8 +526,10 @@ in {
     };
     turingmachine = {
       owner = config.krebs.users.mic92;
-      nets = {
+      nets = rec {
+        internet.addrs = [ "turingmachine.thalheim.io" ];
         retiolum = {
+          via = internet;
           aliases = [
             "turingmachine.r"
           ];
@@ -678,7 +680,9 @@ in {
     jarvis = {
       owner = config.krebs.users.mic92;
       nets = rec {
+        internet.addrs = [ "jarvis.thalheim.io" ];
         retiolum = {
+          via = internet;
           aliases = [ "jarvis.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -697,7 +701,9 @@ in {
     bernie = {
       owner = config.krebs.users.mic92;
       nets = rec {
+        internet.addrs = [ "bernie.thalheim.io" ];
         retiolum = {
+          via = internet;
           aliases = [ "bernie.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -719,7 +725,6 @@ in {
       };
     };
 
-
     ryan = {
       owner = config.krebs.users.mic92;
       nets = rec {