Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 20.03

Browse Source
This commit is contained in:
makefu 2020-04-22 16:06:25 +02:00
commit 7d62165696
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
krebs/3modules/rtorrent.nix
View File

@ -301,6 +301,7 @@ let
default = mkDefault true; default = mkDefault true;
inherit (webcfg) basicAuth; inherit (webcfg) basicAuth;
root = optionalString rucfg.enable webdir; root = optionalString rucfg.enable webdir;
listen = [ { inherit (webcfg) addr port; } ];
locations = { locations = {
"/RPC2".extraConfig = '' "/RPC2".extraConfig = ''
@ -319,15 +320,7 @@ let
include ${pkgs.nginx}/conf/fastcgi.conf; 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 = { rutorrent-imp = {