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

treewide: makefu.airdcpp -> krebs.airdcpp

Browse Source
This commit is contained in:
makefu 2018-09-24 23:32:28 +02:00
parent 796ad2c5c8
commit 20c69c0386
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makefu/3modules/airdcpp.nix → krebs/3modules/airdcpp.nix
View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with import <stockholm/lib>; #genid with import <stockholm/lib>; #genid
let let
cfg = config.makefu.airdcpp; cfg = config.krebs.airdcpp;
out = { out = {
options.makefu.airdcpp = api; options.krebs.airdcpp = api;
config = lib.mkIf cfg.enable imp; config = lib.mkIf cfg.enable imp;
}; };
@ -18,7 +18,7 @@ let
user = mkOption { user = mkOption {
description = '' description = ''
user which will run udpt. if kept default a new user will be created user which will run airdcpp. if kept default a new user will be created
''; '';
type = str; type = str;
default = "airdcpp"; default = "airdcpp";
@ -195,7 +195,7 @@ let
''<Hub Name="${hub.name}" Connect="${ ''<Hub Name="${hub.name}" Connect="${
if hub.AutoConnect then "1" else "0" if hub.AutoConnect then "1" else "0"
}" Description="" Password="${hub.Password}" Server="${hub.Server}" ChatUserSplit="0" UserListState="1" HubFrameOrder="" HubFrameWidths="" HubFrameVisible="" Group="" Bottom="0" Top="0" Right="0" Left="0" Nick="${hub.Nick}"/>'' ) }" Description="" Password="${hub.Password}" Server="${hub.Server}" ChatUserSplit="0" UserListState="1" HubFrameOrder="" HubFrameWidths="" HubFrameVisible="" Group="" Bottom="0" Top="0" Right="0" Left="0" Nick="${hub.Nick}"/>'' )
(mapAttrsToList (name: val: val // { inherit name; }) cfg.hubs); (mapAttrsToList (name: val: val // { inherit name; }) hubs);
favoritesConfigFile = if (cfg.initialFavoritesConfigFile == null) then favoritesConfigFile = if (cfg.initialFavoritesConfigFile == null) then
builtins.trace "warning: airdcpp hub passwords are stored in plain text" pkgs.writeText "initial-config" '' builtins.trace "warning: airdcpp hub passwords are stored in plain text" pkgs.writeText "initial-config" ''
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
@ -206,7 +206,7 @@ let
</Favorites> </Favorites>
'' else cfg.initialFavoritesConfigFile; '' else cfg.initialFavoritesConfigFile;
genShares = shares: concatMapStringsSep "\n" (share: genShares = shares: concatMapStringsSep "\n" (share:
''<Directory Virtual="stockholm" Incoming="${ ''<Directory Virtual="${share.name}" Incoming="${
if share.incoming then "1" else "0" if share.incoming then "1" else "0"
}" LastRefreshTime="0">${share.path}</Directory>'' ) }" LastRefreshTime="0">${share.path}</Directory>'' )
(mapAttrsToList (name: val: val // { inherit name; }) shares); (mapAttrsToList (name: val: val // { inherit name; }) shares);

1
krebs/3modules/default.nix
View File

@ -6,6 +6,7 @@ let
out = { out = {
imports = [ imports = [
./airdcpp.nix
./announce-activation.nix ./announce-activation.nix
./apt-cacher-ng.nix ./apt-cacher-ng.nix
./backup.nix ./backup.nix

0
makefu/5pkgs/airdcpp-webclient/default.nix → krebs/5pkgs/simple/airdcpp-webclient/default.nix
View File

14
makefu/2configs/dcpp/airdcpp.nix
View File

@ -1,6 +1,6 @@
{ config, ... }: { config, ... }:
{ {
makefu.airdcpp = { krebs.airdcpp = {
enable = true; enable = true;
extraGroups = [ "download" ]; extraGroups = [ "download" ];
web.port = 5600; web.port = 5600;
@ -14,8 +14,8 @@
dcpp = { dcpp = {
shares = { shares = {
# Incoming must be writeable! # Incoming must be writeable!
incoming = { path = config.makefu.dl-dir + "/dcpp"; incoming = true; }; incoming = { path = config.makefu.dl-dir + "/finished/dcpp"; incoming = true; };
audiobooks.path = config.makefu.dl-dir + "/audiobooks"; audiobooks.path = config.makefu.dl-dir + "/finished/audiobooks";
}; };
Nick = "makefu"; Nick = "makefu";
DownloadSpeed = "1000"; DownloadSpeed = "1000";
@ -23,13 +23,13 @@
}; };
}; };
networking.firewall.allowedTCPPorts = networking.firewall.allowedTCPPorts =
[ config.makefu.airdcpp.dcpp.InPort [ config.krebs.airdcpp.dcpp.InPort
config.makefu.airdcpp.dcpp.TLSPort config.krebs.airdcpp.dcpp.TLSPort
]; ];
networking.firewall.allowedUDPPorts = [ config.makefu.airdcpp.dcpp.UDPPort ]; networking.firewall.allowedUDPPorts = [ config.krebs.airdcpp.dcpp.UDPPort ];
services.nginx.virtualHosts."dcpp.${config.krebs.build.host.name}.r".locations."/" = services.nginx.virtualHosts."dcpp.${config.krebs.build.host.name}.r".locations."/" =
{ proxyPass = "http://localhost:${toString config.makefu.airdcpp.web.port}/"; { proxyPass = "http://localhost:${toString config.krebs.airdcpp.web.port}/";
extraConfig = '' extraConfig = ''
proxy_set_header Host $host; proxy_set_header Host $host;

1
makefu/3modules/default.nix
View File

@ -2,7 +2,6 @@ _:
{ {
imports = [ imports = [
./airdcpp.nix
./awesome-extra.nix ./awesome-extra.nix
./deluge.nix ./deluge.nix
./forward-journal.nix ./forward-journal.nix