diff options
| author | makefu <github@syntax-fehler.de> | 2020-04-22 16:05:06 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-04-22 16:05:20 +0200 |
| commit | a40a1f9c6c87b650ba0fde699dc07dee3715d43e (patch) | |
| tree | 1fd660a0e6c4bbcb4644cfc002f58deba2cb0c0b | |
| parent | c96504d9a0f8f9f5c80c9630906c177ff3667e55 (diff) | |
rtorrent module: remove 17.03 crutch
| -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 = { |