Merge remote-tracking branch 'prism/master'

3 files changed, 2 insertions, 136 deletions

diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix
index c6c91e074..a802b8a25 100644
--- a/krebs/2configs/ircd.nix
+++ b/krebs/2configs/ircd.nix
@@ -5,9 +5,9 @@
     6667
   ];
 
-  krebs.ergo = {
+  services.ergochat = {
     enable = true;
-    config = {
+    settings = {
       server.secure-nets = [
         "42::0/16"
         "10.240.0.0/12"
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index e8f5d1611..0ac8cb743 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -20,7 +20,6 @@ let
       ./ci
       ./current.nix
       ./dns.nix
-      ./ergo.nix
       ./exim-retiolum.nix
       ./exim-smarthost.nix
       ./exim.nix
diff --git a/krebs/3modules/ergo.nix b/krebs/3modules/ergo.nix
deleted file mode 100644
index d5f167e79..000000000
--- a/krebs/3modules/ergo.nix
+++ /dev/null
@@ -1,133 +0,0 @@
-{ config, lib, options, pkgs, ... }: {
-  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 = ''
-          Ergo IRC daemon configuration file.
-          https://raw.githubusercontent.com/ergochat/ergo/master/default.yaml
-        '';
-        default = {
-          network = {
-            name = "krebstest";
-          };
-          server = {
-            name = "${config.networking.hostName}.r";
-            listeners = {
-              ":6667" = {};
-            };
-            casemapping = "permissive";
-            enforce-utf = true;
-            lookup-hostnames = false;
-            ip-cloaking = {
-              enabled = false;
-            };
-            forward-confirm-hostnames = false;
-            check-ident = false;
-            relaymsg = {
-              enabled = false;
-            };
-            max-sendq = "1M";
-            ip-limits = {
-              count = false;
-              throttle = false;
-            };
-          };
-          datastore = {
-            autoupgrade = true;
-            path = "/var/lib/ergo/ircd.db";
-          };
-          accounts = {
-            authentication-enabled = true;
-            registration = {
-              enabled = true;
-              allow-before-connect = true;
-              throttling = {
-                enabled = true;
-                duration = "10m";
-                max-attempts = 30;
-              };
-              bcrypt-cost = 4;
-              email-verification.enabled = false;
-            };
-            multiclient = {
-              enabled = true;
-              allowed-by-default = true;
-              always-on = "opt-out";
-              auto-away = "opt-out";
-            };
-          };
-          channels = {
-            default-modes = "+ntC";
-            registration = {
-              enabled = true;
-            };
-          };
-          limits = {
-            nicklen = 32;
-            identlen = 20;
-            channellen = 64;
-            awaylen = 390;
-            kicklen = 390;
-            topiclen = 390;
-          };
-          history = {
-            enabled = true;
-            channel-length = 2048;
-            client-length = 256;
-            autoresize-window = "3d";
-            autoreplay-on-join = 0;
-            chathistory-maxmessages = 100;
-            znc-maxmessages = 2048;
-            restrictions = {
-              expire-time = "1w";
-              query-cutoff = "none";
-              grace-period = "1h";
-            };
-            retention = {
-              allow-individual-delete = false;
-              enable-account-indexing = false;
-            };
-            tagmsg-storage = {
-              default = false;
-              whitelist = [
-                "+draft/react"
-                "+react"
-              ];
-            };
-          };
-        };
-      };
-    };
-  };
-  config = let
-    cfg = config.krebs.ergo;
-    configFile = pkgs.writeJSON "ergo.conf" cfg.config;
-  in lib.mkIf cfg.enable ({
-    environment.etc."ergo.yaml".source = configFile;
-    krebs.ergo.config =
-      lib.mapAttrsRecursive (_: lib.mkDefault) options.krebs.ergo.config.default;
-    systemd.services.ergo = {
-      description = "Ergo IRC daemon";
-      wantedBy = [ "multi-user.target" ];
-      # reload currently not working as expected
-      # reloadIfChanged = true;
-      restartTriggers = [ configFile ];
-      serviceConfig = {
-        ExecStart = "${pkgs.ergochat}/bin/ergo run --conf /etc/ergo.yaml";
-        ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
-        DynamicUser = true;
-        StateDirectory = "ergo";
-        LimitNOFILE = "${toString cfg.openFilesLimit}";
-      };
-    };
-  });
-}