diff options
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/Reaktor.nix | 15 | ||||
| -rw-r--r-- | krebs/3modules/default.nix | 33 |
2 files changed, 42 insertions, 6 deletions
diff --git a/krebs/3modules/Reaktor.nix b/krebs/3modules/Reaktor.nix index 407f1bce7..fce24fa63 100644 --- a/krebs/3modules/Reaktor.nix +++ b/krebs/3modules/Reaktor.nix @@ -40,7 +40,7 @@ let nickname = mkOption { default = config.krebs.build.host.name + "|r"; - type = types.str; + type = types.string; description = '' The nick name of the irc bot. Defaults to {hostname}|r @@ -58,7 +58,7 @@ let }; extraConfig = mkOption { default = ""; - type = types.str; + type = types.string; description = '' configuration appended to the default or overridden configuration ''; @@ -70,6 +70,12 @@ let the Reaktor pkg to use. ''; }; + debug = mkOption { + default = false; + description = '' + Reaktor debug output + ''; + }; }; imp = { @@ -101,6 +107,7 @@ let environment = { GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; REAKTOR_NICKNAME = cfg.nickname; + REAKTOR_DEBUG = (if cfg.debug then "True" else "False"); }; serviceConfig= { ExecStartPre = pkgs.writeScript "Reaktor-init" '' @@ -115,8 +122,8 @@ let PrivateTmp = "true"; User = "Reaktor"; Restart = "on-abort"; - #StartLimitInterval = "5m"; - #StartLimitBurst = "1"; + StartLimitInterval = "1m"; + StartLimitBurst = "1"; }; }; }; diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 077a0e069..a6b5a1906 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -59,8 +59,6 @@ let --exclude .graveyard \ --exclude old \ --rsync-path="mkdir -p \"$2\" && rsync" \ - --usermap=\*:0 \ - --groupmap=\*:0 \ --delete-excluded \ -vrLptgoD \ "$src" "$dst" @@ -219,6 +217,37 @@ let lass-imp = { hosts = addNames { + echelon = { + cores = 4; + dc = "lass"; #dc = "cac"; + nets = rec { + internet = { + addrs4 = ["162.248.167.198"]; + aliases = [ + "echelon.internet" + ]; + }; + retiolum = { + via = internet; + addrs4 = ["10.243.206.103"]; + addrs6 = ["42:941e:2816:35f4:5c5e:206b:3f0b:f763"]; + aliases = [ + "echelon.retiolum" + "cgit.echelon.retiolum" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEA92ybhDahtGybpAkUNlG5Elxw05MVY4Pg7yK0dQugB4nVq+pnmi78 + DOMeIciecMHmJM8n9UlUU0eWZVCgHeVd23d6J0hTHCv24p24uHEGGy7XlO/dPJ6A + IjROYU0l8c03pipdJ3cDBx6riArSglwmZJ7xH/Iw0BUhRZrPqbtijY7EcG2wc+8K + N9N9mBofVMl4EcBiDR/eecK+ro8OkeOmYPtYgFJLvxTYXiPIhOxMAlkOY2fpin/t + cgFLUFuN4ag751XjjcNpVovVq95vdg+VhKrrNVWZjJt03owW81BzoryY6CD2kIPq + UxK89zEdeYOUT7AxaT/5V5v41IvGFZxCzwIDAQAB + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; cloudkrebs = { cores = 1; dc = "lass"; #dc = "cac"; |