From 0cce2f9d14766dc29674c098fe84aaca0adc7876 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 21 Jul 2017 09:06:30 +0200 Subject: wolf.r: add makefu-omo pubkey access will be used to perform backups --- krebs/1systems/wolf/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index b8cc1b4a1..ba897a26e 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -101,6 +101,7 @@ in users.extraUsers.root.openssh.authorizedKeys.keys = [ config.krebs.users.ulrich.pubkey + config.krebs.users.makefu-omo.pubkey ]; time.timeZone = "Europe/Berlin"; -- cgit v1.2.3 From 3b5854722294a8f1263690be9d370d247ed6037a Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 21 Jul 2017 10:48:29 +0200 Subject: ma gum.r: bitlbee with telegram --- makefu/1systems/gum/config.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index aaddd8a68..bbb8cfe11 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -14,7 +14,7 @@ let in { imports = [ - + # @@ -33,6 +33,8 @@ in { + + # services @@ -106,7 +108,10 @@ in { bepasty-client-cli get ]; - services.bitlbee.enable = true; + services.bitlbee = { + enable = true; + libpurple_plugins = [ pkgs.telegram-purple ]; + }; # Hardware boot.loader.grub.device = main-disk; -- cgit v1.2.3 From 6728e7316c99aec575e8c04819ae70008a436746 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 21 Jul 2017 10:49:11 +0200 Subject: ma omo: enable sshd-totp --- makefu/1systems/omo/config.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 732f1d860..918af39d6 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -53,14 +53,20 @@ in { + # Logging - + #influx + grafana + - + # logs to influx + # services + + # security + # # -- cgit v1.2.3 From 0983acf6ede116ce5091686ca3e169df2c5c1a8e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 21 Jul 2017 10:49:31 +0200 Subject: ma omo: split Reaktor into 3 instances --- makefu/1systems/omo/config.nix | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 918af39d6..e43b203b4 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -195,8 +195,29 @@ in { zramSwap.enable = true; krebs.Reaktor.reaktor = { - nickname = "Reaktor|bot"; - channels = [ "#krebs" "#shackspace" "#binaergewitter" ]; + nickname = "Reaktor|krebs"; + workdir = "/var/lib/Reaktor/krebs"; + channels = [ "#krebs" ]; + plugins = with pkgs.ReaktorPlugins;[ + stockholm-issue + nixos-version + sed-plugin + random-emoji ]; + }; + krebs.Reaktor.reaktor-shack = { + nickname = "Reaktor|shack"; + workdir = "/var/lib/Reaktor/shack"; + channels = [ "#shackspace" ]; + plugins = with pkgs.ReaktorPlugins;[ + shack-correct + # stockholm-issue + sed-plugin + random-emoji ]; + }; + krebs.Reaktor.reaktor-bgt = { + nickname = "Reaktor|bgt"; + workdir = "/var/lib/Reaktor/bgt"; + channels = [ "#binaergewitter" ]; plugins = with pkgs.ReaktorPlugins;[ titlebot # stockholm-issue -- cgit v1.2.3 From 3395a2cfb216a1d36cd1f80f37359db1eb2e0276 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 21 Jul 2017 10:49:56 +0200 Subject: ma omo: enable musnix in sources --- makefu/1systems/studio/source.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/makefu/1systems/studio/source.nix b/makefu/1systems/studio/source.nix index af0f37809..f662653e7 100644 --- a/makefu/1systems/studio/source.nix +++ b/makefu/1systems/studio/source.nix @@ -1,7 +1,4 @@ import { name="studio"; - override.musnix.git = { - url = https://github.com/musnix/musnix.git; - ref = "d8b989f"; - }; + musnix = true; } -- cgit v1.2.3