diff options
| author | lassulus <lass@blue.r> | 2018-08-09 17:23:53 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-08-09 17:23:53 +0200 |
| commit | 2bf24eae616997e52a16fff96b4485ee7c619f8d (patch) | |
| tree | cbb3aab9f8fa2f4da28e5a01b16129263b1fa0cb /krebs/3modules | |
| parent | f9d96d13de74ed6acbde92778af88f94f04081bd (diff) | |
| parent | 6368507f02eb4e267c7fdab73e4c3cec5ee5827f (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 9 | ||||
| -rw-r--r-- | krebs/3modules/rtorrent.nix | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index c5404f96d..9630d7a7f 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -336,7 +336,6 @@ with import <stockholm/lib>; "krebsco.de" = '' euer IN MX 1 aspmx.l.google.com. nixos.unstable IN CNAME krebscode.github.io. - gold IN A ${nets.internet.ip4.addr} boot IN A ${nets.internet.ip4.addr} ''; }; @@ -522,6 +521,13 @@ with import <stockholm/lib>; }; nextgum = rec { ci = true; + extraZones = { + "krebsco.de" = '' + cache.euer IN A ${nets.internet.ip4.addr} + cache.gum IN A ${nets.internet.ip4.addr} + gold IN A ${nets.internet.ip4.addr} + ''; + }; cores = 8; nets = rec { internet = { @@ -537,6 +543,7 @@ with import <stockholm/lib>; ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d3"; aliases = [ "nextgum.r" + "cache.gum.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index b7ef824b5..09e552010 100644 --- a/krebs/3modules/rtorrent.nix +++ b/krebs/3modules/rtorrent.nix @@ -29,7 +29,7 @@ let ''} ${optionalString (cfg.watchDir != null) '' - schedule = watch_directory,5,5,load_start=${cfg.watchDir}/*.torrent + directory.watch.added = "${cfg.watchDir}", load.start_verbose ''} directory = ${cfg.downloadDir} |