diff options
author | lassulus <lass@lassul.us> | 2017-01-10 14:54:34 +0100 |
---|---|---|
committer | lassulus <lass@lassul.us> | 2017-01-10 14:54:34 +0100 |
commit | 131de9bbd174011e072b116792ce32d8591e7670 (patch) | |
tree | 2d4ebf7a19ce5eab911aea56cced0d18224f54bf /krebs/3modules | |
parent | 79cfd8b26f560e0d792a392efdcc7d7a9e1daf1e (diff) | |
parent | a510069d86bd00d9ff348bdad321294cdf42dafb (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r-- | krebs/3modules/makefu/default.nix | 4 | ||||
-rw-r--r-- | krebs/3modules/rtorrent.nix | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index c85bf1ccd..9942ac043 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -453,6 +453,8 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB git.euer IN A ${nets.internet.ip4.addr} gum IN A ${nets.internet.ip4.addr} cgit.euer IN A ${nets.internet.ip4.addr} + o.euer IN A ${nets.internet.ip4.addr} + dl.euer IN A ${nets.internet.ip4.addr} ''; }; nets = rec { @@ -470,6 +472,8 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB "gum.r" "gum.retiolum" "cgit.gum.retiolum" + "o.gum.r" + "o.gum.retiolum" "tracker.makefu.r" "tracker.makefu.retiolum" ]; diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index 0c478aded..d85518993 100644 --- a/krebs/3modules/rtorrent.nix +++ b/krebs/3modules/rtorrent.nix @@ -224,13 +224,14 @@ let cp -f ${configFile} ${cfg.workDir}/.rtorrent.rc ''; ExecStart = "${pkgs.tmux}/bin/tmux new-session -s rt -n rtorrent -d 'PATH=/bin:/usr/bin:${makeBinPath rutorrent-deps} ${cfg.package}/bin/rtorrent'"; + Restart = "always"; + RestartSec = "10"; ## you can simply sudo -u rtorrent tmux a if privateTmp is set to false ## otherwise the tmux session is stored in some private folder in /tmp PrivateTmp = false; WorkingDirectory = cfg.workDir; - Restart = "on-failure"; User = "${cfg.user}"; }; }; |