summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-24 23:32:28 +0200
committermakefu <github@syntax-fehler.de>2018-09-24 23:32:28 +0200
commit20c69c0386df4606af544342d7de6638356572a3 (patch)
treeabbd3b51eff8cd5ab8d962acabacd135a6fdcabd
parent796ad2c5c8ed67a4ece5a78e8e9cd5e1fbfe4e9e (diff)
treewide: makefu.airdcpp -> krebs.airdcpp
-rw-r--r--krebs/3modules/airdcpp.nix (renamed from makefu/3modules/airdcpp.nix)10
-rw-r--r--krebs/3modules/default.nix1
-rw-r--r--krebs/5pkgs/simple/airdcpp-webclient/default.nix (renamed from makefu/5pkgs/airdcpp-webclient/default.nix)0
-rw-r--r--makefu/2configs/dcpp/airdcpp.nix14
-rw-r--r--makefu/3modules/default.nix1
5 files changed, 13 insertions, 13 deletions
diff --git a/makefu/3modules/airdcpp.nix b/krebs/3modules/airdcpp.nix
index 342052e70..8c72680f3 100644
--- a/makefu/3modules/airdcpp.nix
+++ b/krebs/3modules/airdcpp.nix
@@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }:
with import <stockholm/lib>; #genid
let
- cfg = config.makefu.airdcpp;
+ cfg = config.krebs.airdcpp;
out = {
- options.makefu.airdcpp = api;
+ options.krebs.airdcpp = api;
config = lib.mkIf cfg.enable imp;
};
@@ -18,7 +18,7 @@ let
user = mkOption {
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;
default = "airdcpp";
@@ -195,7 +195,7 @@ let
''<Hub Name="${hub.name}" Connect="${
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}"/>'' )
- (mapAttrsToList (name: val: val // { inherit name; }) cfg.hubs);
+ (mapAttrsToList (name: val: val // { inherit name; }) hubs);
favoritesConfigFile = if (cfg.initialFavoritesConfigFile == null) then
builtins.trace "warning: airdcpp hub passwords are stored in plain text" pkgs.writeText "initial-config" ''
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
@@ -206,7 +206,7 @@ let
</Favorites>
'' else cfg.initialFavoritesConfigFile;
genShares = shares: concatMapStringsSep "\n" (share:
- ''<Directory Virtual="stockholm" Incoming="${
+ ''<Directory Virtual="${share.name}" Incoming="${
if share.incoming then "1" else "0"
}" LastRefreshTime="0">${share.path}</Directory>'' )
(mapAttrsToList (name: val: val // { inherit name; }) shares);
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 82ae3b02e..43375ed53 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -6,6 +6,7 @@ let
out = {
imports = [
+ ./airdcpp.nix
./announce-activation.nix
./apt-cacher-ng.nix
./backup.nix
diff --git a/makefu/5pkgs/airdcpp-webclient/default.nix b/krebs/5pkgs/simple/airdcpp-webclient/default.nix
index 361a7da65..361a7da65 100644
--- a/makefu/5pkgs/airdcpp-webclient/default.nix
+++ b/krebs/5pkgs/simple/airdcpp-webclient/default.nix
diff --git a/makefu/2configs/dcpp/airdcpp.nix b/makefu/2configs/dcpp/airdcpp.nix
index 44940812d..fe05effd9 100644
--- a/makefu/2configs/dcpp/airdcpp.nix
+++ b/makefu/2configs/dcpp/airdcpp.nix
@@ -1,6 +1,6 @@
{ config, ... }:
{
- makefu.airdcpp = {
+ krebs.airdcpp = {
enable = true;
extraGroups = [ "download" ];
web.port = 5600;
@@ -14,8 +14,8 @@
dcpp = {
shares = {
# Incoming must be writeable!
- incoming = { path = config.makefu.dl-dir + "/dcpp"; incoming = true; };
- audiobooks.path = config.makefu.dl-dir + "/audiobooks";
+ incoming = { path = config.makefu.dl-dir + "/finished/dcpp"; incoming = true; };
+ audiobooks.path = config.makefu.dl-dir + "/finished/audiobooks";
};
Nick = "makefu";
DownloadSpeed = "1000";
@@ -23,13 +23,13 @@
};
};
networking.firewall.allowedTCPPorts =
- [ config.makefu.airdcpp.dcpp.InPort
- config.makefu.airdcpp.dcpp.TLSPort
+ [ config.krebs.airdcpp.dcpp.InPort
+ 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."/" =
- { proxyPass = "http://localhost:${toString config.makefu.airdcpp.web.port}/";
+ { proxyPass = "http://localhost:${toString config.krebs.airdcpp.web.port}/";
extraConfig = ''
proxy_set_header Host $host;
diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix
index 963649c63..7146174fb 100644
--- a/makefu/3modules/default.nix
+++ b/makefu/3modules/default.nix
@@ -2,7 +2,6 @@ _:
{
imports = [
- ./airdcpp.nix
./awesome-extra.nix
./deluge.nix
./forward-journal.nix