summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/gum.nix1
-rw-r--r--makefu/2configs/deployment/newsbot.nix18
-rw-r--r--makefu/2configs/torrent.nix4
3 files changed, 21 insertions, 2 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index 3186f888..4850aedc 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 00000000..74880344
--- /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 69d40094..85d2e6c6 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"