diff options
-rw-r--r-- | krebs/3modules/makefu/default.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/gum.nix | 1 | ||||
-rw-r--r-- | makefu/2configs/deployment/newsbot.nix | 18 | ||||
-rw-r--r-- | makefu/2configs/torrent.nix | 4 |
4 files changed, 22 insertions, 3 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index cef6a4fd6..6b32fc38a 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -173,7 +173,7 @@ with import <stockholm/lib>; }; }; x = { - cores = 2; + cores = 4; nets = { retiolum = { ip4.addr = "10.243.0.91"; diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 3186f8887..4850aedc1 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -27,6 +27,7 @@ in { ## Web ../2configs/deployment/owncloud.nix + ../2configs/deployment/newsbot.nix ../2configs/nginx/share-download.nix ../2configs/nginx/euer.test.nix ../2configs/nginx/euer.wiki.nix diff --git a/makefu/2configs/deployment/newsbot.nix b/makefu/2configs/deployment/newsbot.nix new file mode 100644 index 000000000..748803447 --- /dev/null +++ b/makefu/2configs/deployment/newsbot.nix @@ -0,0 +1,18 @@ +{ config, pkgs, ... }: + +let + newsfile = pkgs.writeText "feeds" '' + nixoswiki-bot|https://github.com/Mic92/nixos-wiki/wiki.atom|#krebs + ''; +in { + environment.systemPackages = [ + pkgs.newsbot-js + ]; + krebs.newsbot-js = { + enable = true; + ircServer = "chat.freenode.net"; + feeds = newsfile; + urlShortenerHost = "go"; + urlShortenerPort = "80"; + }; +} diff --git a/makefu/2configs/torrent.nix b/makefu/2configs/torrent.nix index 69d40094f..85d2e6c67 100644 --- a/makefu/2configs/torrent.nix +++ b/makefu/2configs/torrent.nix @@ -20,7 +20,7 @@ in { download = { name = "download"; home = dl-dir; - uid = genid "download"; + uid = mkDefault (genid "download"); createHome = true; useDefaultShell = true; group = "download"; @@ -39,7 +39,7 @@ in { users.extraGroups = { download = { - gid = genid "download"; + gid = lib.mkDefault (genid "download"); members = [ config.krebs.build.user.name "download" |