summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-04-22 16:06:25 +0200
committermakefu <github@syntax-fehler.de>2020-04-22 16:06:25 +0200
commit7d62165696171c2a827428798af5e9734c08298b (patch)
tree41bd71dac2cbb4c22b3c60a4247cd721a8f0ca7d /krebs
parent18b3df8741c7fd00252e5f41094844955f6e2294 (diff)
parenta40a1f9c6c87b650ba0fde699dc07dee3715d43e (diff)
Merge branch 'master' into 20.03
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/rtorrent.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix
index 43c2798d5..eb27aa34d 100644
--- a/krebs/3modules/rtorrent.nix
+++ b/krebs/3modules/rtorrent.nix
@@ -301,6 +301,7 @@ let
default = mkDefault true;
inherit (webcfg) basicAuth;
root = optionalString rucfg.enable webdir;
+ listen = [ { inherit (webcfg) addr port; } ];
locations = {
"/RPC2".extraConfig = ''
@@ -319,15 +320,7 @@ let
include ${pkgs.nginx}/conf/fastcgi.conf;
''; }
);
- # workaround because upstream nginx api changed
- # TODO remove when nobody uses 17.03 anymore
- } // (if hasAttr "port" (head options.services.nginx.virtualHosts.type.getSubModules).submodule.options then {
- port = webcfg.port;
- } else {
- listen = [
- { inherit (webcfg) addr port; }
- ];
- });
+ };
};
rutorrent-imp = {