diff options
author | lassulus <lassulus@lassul.us> | 2020-04-22 16:44:20 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2020-04-22 16:44:20 +0200 |
commit | 96102f20ccd6d42163b9455886b1ef60e2b6724f (patch) | |
tree | 9fd877a0973eeebd48a5abc0bacb170224c1b2d2 /krebs | |
parent | 39236226cdf8692b5904831471d9ad45942146a4 (diff) | |
parent | c80ca049f1db5725a10f7110aeb5e63eb5b88611 (diff) |
Merge remote-tracking branch 'gum/20.03'
Diffstat (limited to 'krebs')
-rw-r--r-- | krebs/3modules/rtorrent.nix | 11 |
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 = { |