From 3285aefea4f8cadb389e4cc96c2621dc9b7e8b14 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Sep 2018 11:16:16 +0200
Subject: ma airdcpp module: add hubs

---
 makefu/3modules/airdcpp.nix | 73 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 7 deletions(-)

(limited to 'makefu/3modules')

diff --git a/makefu/3modules/airdcpp.nix b/makefu/3modules/airdcpp.nix
index 5250ee67a..6709f0238 100644
--- a/makefu/3modules/airdcpp.nix
+++ b/makefu/3modules/airdcpp.nix
@@ -37,6 +37,51 @@ let
       type = str;
       default = "/var/lib/airdcpp";
     };
+    hubs = mkOption {
+        type = attrsOf (submodule ( { config, ... }: {
+          options = {
+            Nick = mkOption {
+              description = ''
+                Nick Name for hub
+              '';
+              type = str;
+              default = cfg.Nick;
+            };
+            Password = mkOption {
+              description = ''
+                Password to be used
+
+                WARNING: will be stored in plain text in /nix/store
+              '';
+              type = str;
+              default = "";
+            };
+            Server = mkOption {
+              description = ''
+                URL to the hub (must be provided)
+              '';
+              type = str;
+            };
+            AutoConnect = mkOption {
+              description = ''
+                automatically connect to the hub
+              '';
+              type = bool;
+              default = false;
+            };
+          };
+        }));
+        description = "hubs which should be configured via Favorites.xml,
+        Options are only used if no initial Favorites.xml file is provided and none exists";
+        default = {};
+    };
+    initialFavoritesConfigFile = mkOption {
+      description = ''
+        path inital Favorites.xml configuration if none exists
+      '';
+      type = nullOr path;
+      default = null;
+    };
     dcpp = {
       Nick = mkOption {
         description = ''
@@ -133,11 +178,6 @@ let
     genUsers = users: concatMapStringsSep "\n" (user: 
       ''<WebUser Username="${user.name}" Password="${user.password}" LastLogin="0" Permissions="${user.permissions}"/>'' )
       (mapAttrsToList (name: val: val // { inherit name; }) users);
-    genShares = shares: concatMapStringsSep "\n" (share:
-      ''<Directory Virtual="stockholm" Incoming="${
-          if share.incoming then "1" else "0"
-        }" LastRefreshTime="0">${share.path}</Directory>'' )
-      (mapAttrsToList (name: val: val // { inherit name; }) shares);
     webConfigFile = if (cfg.web.initialConfigFile == null) then builtins.trace "warning: airdcpp passwords are stored in plain text" pkgs.writeText "initial-config" ''
       <?xml version="1.0" encoding="utf-8" standalone="yes"?>
       <WebServer>
@@ -149,16 +189,33 @@ let
         </WebUsers>
       </WebServer>
       '' else cfg.web.initialConfigFile;
+    genHubs = hubs: concatMapStringsSep "\n" (hub:
+      ''<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);
+    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"?>
+        <Favorites>
+          <Hubs>
+            ${genHubs cfg.hubs}
+          </Hubs>
+        </Favorites>
+      '' else cfg.initialFavoritesConfigFile;
+    genShares = shares: concatMapStringsSep "\n" (share:
+      ''<Directory Virtual="stockholm" Incoming="${
+          if share.incoming then "1" else "0"
+        }" LastRefreshTime="0">${share.path}</Directory>'' )
+      (mapAttrsToList (name: val: val // { inherit name; }) shares);
     dcppConfigFile = if (cfg.dcpp.initialConfigFile == null) then pkgs.writeText "initial-config" ''
     <?xml version="1.0" encoding="utf-8" standalone="yes"?>
     <DCPlusPlus>
       <Settings>
         <Nick type="string">${cfg.dcpp.Nick}</Nick>
-        <ConfigVersion type="string">${cfg.package.version}</ConfigVersion>
         <InPort type="int">${toString cfg.dcpp.InPort}</InPort>
         <UDPPort type="int">${toString cfg.dcpp.UDPPort}</UDPPort>
         <TLSPort type="int">${toString cfg.dcpp.TLSPort}</TLSPort>
-        <ConfigBuildNumber type="int">0</ConfigBuildNumber>
         <AutoDetectIncomingConnection type="int">0</AutoDetectIncomingConnection>
         <NoIpOverride type="int">1</NoIpOverride>
         <WizardRunNew type="int">0</WizardRunNew>
@@ -187,6 +244,8 @@ let
           test -e $d || install -m700 -o${cfg.user} ${webConfigFile} $d
           d=${cfg.stateDir}/DCPlusPlus.xml
           test -e $d || install -m700 -o${cfg.user} ${dcppConfigFile} $d
+          d=${cfg.stateDir}/Favorites.xml
+          test -e $d || install -m700 -o${cfg.user} ${favoritesConfigFile} $d
         '';
         PermissionsStartOnly = true;
         ExecStart = "${cfg.package}/bin/airdcppd -c=${cfg.stateDir} -p=${cfg.stateDir}/airdcpp.pid";
-- 
cgit v1.2.3


From b1c9bcf85c7cb0d3f02554d9a8d7045f1a16bd2c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Sep 2018 14:15:08 +0200
Subject: ma airdcpp.mod: remove newlines from passwords

---
 makefu/3modules/airdcpp.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'makefu/3modules')

diff --git a/makefu/3modules/airdcpp.nix b/makefu/3modules/airdcpp.nix
index 6709f0238..342052e70 100644
--- a/makefu/3modules/airdcpp.nix
+++ b/makefu/3modules/airdcpp.nix
@@ -55,6 +55,7 @@ let
               '';
               type = str;
               default = "";
+              apply = lib.removeSuffix "\n";
             };
             Server = mkOption {
               description = ''
@@ -162,6 +163,7 @@ let
             password = mkOption {
               description = "password of user";
               type = str;
+              apply = lib.removeSuffix "\n";
             };
             permissions = mkOption {
               description = "user permissions";
-- 
cgit v1.2.3


From 49e0ae20c9ac96c3f2e12e0faf6d2bd7e9348d61 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Sep 2018 14:34:27 +0200
Subject: ma modules: add airdcpp

---
 makefu/3modules/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'makefu/3modules')

diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix
index f06ce3d53..963649c63 100644
--- a/makefu/3modules/default.nix
+++ b/makefu/3modules/default.nix
@@ -2,17 +2,18 @@ _:
 
 {
   imports = [
-    ./state.nix
-    ./populate.nix
+    ./airdcpp.nix
     ./awesome-extra.nix
     ./deluge.nix
     ./forward-journal.nix
     ./opentracker.nix
     ./ps3netsrv.nix
     ./logging-config.nix
+    ./populate.nix
     ./sane-extra.nix
     ./server-config.nix
     ./snapraid.nix
+    ./state.nix
     ./torrent.nix
     ./udpt.nix
   ];
-- 
cgit v1.2.3


From 796ad2c5c8ed67a4ece5a78e8e9cd5e1fbfe4e9e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Sep 2018 14:34:50 +0200
Subject: ma state.mod: put activation logic into module

---
 makefu/3modules/state.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'makefu/3modules')

diff --git a/makefu/3modules/state.nix b/makefu/3modules/state.nix
index 461b90152..a87f438fe 100644
--- a/makefu/3modules/state.nix
+++ b/makefu/3modules/state.nix
@@ -6,4 +6,11 @@
     description = "state which is currently scattered on the machine";
     default = [];
   };
+
+  config.system.activationScripts.state =  lib.optionalString (config.state != []) ''
+    cat << EOF
+    This machine is burdened with state:
+    ${lib.concatMapStringsSep "\n" (d: "* ${d}") config.state}
+    EOF
+  '';
 }
-- 
cgit v1.2.3


From 20c69c0386df4606af544342d7de6638356572a3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Sep 2018 23:32:28 +0200
Subject: treewide: makefu.airdcpp -> krebs.airdcpp

---
 makefu/3modules/airdcpp.nix | 271 --------------------------------------------
 makefu/3modules/default.nix |   1 -
 2 files changed, 272 deletions(-)
 delete mode 100644 makefu/3modules/airdcpp.nix

(limited to 'makefu/3modules')

diff --git a/makefu/3modules/airdcpp.nix b/makefu/3modules/airdcpp.nix
deleted file mode 100644
index 342052e70..000000000
--- a/makefu/3modules/airdcpp.nix
+++ /dev/null
@@ -1,271 +0,0 @@
-{ config, lib, pkgs, ... }:
-with import <stockholm/lib>; #genid
-let
-  cfg = config.makefu.airdcpp;
-
-  out = {
-    options.makefu.airdcpp = api;
-    config = lib.mkIf cfg.enable imp;
-  };
-
-  api = with types;{
-    enable = mkEnableOption "airdcpp";
-
-    package = mkOption {
-      type = package;
-      default = pkgs.airdcpp-webclient;
-    };
-
-    user = mkOption {
-      description = ''
-        user which will run udpt. if kept default a new user will be created
-      '';
-      type = str;
-      default = "airdcpp";
-    };
-    extraGroups = mkOption {
-      description = ''extra groups for the user (only for default user)'';
-      type = listOf str;
-      default = [];
-      example = [ "nginx" ];
-    };
-
-    stateDir = mkOption {
-      description = ''
-        directory for storing state (pid,config)
-      '';
-      type = str;
-      default = "/var/lib/airdcpp";
-    };
-    hubs = mkOption {
-        type = attrsOf (submodule ( { config, ... }: {
-          options = {
-            Nick = mkOption {
-              description = ''
-                Nick Name for hub
-              '';
-              type = str;
-              default = cfg.Nick;
-            };
-            Password = mkOption {
-              description = ''
-                Password to be used
-
-                WARNING: will be stored in plain text in /nix/store
-              '';
-              type = str;
-              default = "";
-              apply = lib.removeSuffix "\n";
-            };
-            Server = mkOption {
-              description = ''
-                URL to the hub (must be provided)
-              '';
-              type = str;
-            };
-            AutoConnect = mkOption {
-              description = ''
-                automatically connect to the hub
-              '';
-              type = bool;
-              default = false;
-            };
-          };
-        }));
-        description = "hubs which should be configured via Favorites.xml,
-        Options are only used if no initial Favorites.xml file is provided and none exists";
-        default = {};
-    };
-    initialFavoritesConfigFile = mkOption {
-      description = ''
-        path inital Favorites.xml configuration if none exists
-      '';
-      type = nullOr path;
-      default = null;
-    };
-    dcpp = {
-      Nick = mkOption {
-        description = ''
-          Nick Name for connection
-        '';
-        type = str;
-        default = "kevin";
-      };
-      InPort = mkOption {
-        description = "Input Port";
-        type = int;
-        default = 16849;
-      };
-      UDPPort = mkOption {
-        description = "UDP open Port";
-        type = int;
-        default = 16849;
-      };
-      TLSPort = mkOption {
-        description = "TLS open Port";
-        type = int;
-        default = 16869;
-      };
-      DownloadSpeed = mkOption {
-        description = "Total Download Speed in Mbps/s";
-        type = str;
-        default = "100";
-      };
-      UploadSpeed = mkOption {
-        description = "Total Upload Speed in Mbp/s";
-        type = str;
-        default = "100";
-      };
-      shares = mkOption {
-        default = {};
-        type = attrsOf (submodule ( { config, ... }: {
-          options = {
-            path = mkOption {
-              description = "path to the share";
-              type = str;
-            };
-            incoming = mkOption {
-              description = "incoming";
-              type = bool;
-              default = false;
-            };
-          };
-        }));
-      };
-      initialConfigFile = mkOption {
-        description = ''
-          path inital DCPlusPlus.xml configuration if none exists
-        '';
-        type = nullOr path;
-        default = null;
-      };
-    };
-    web = {
-      port = mkOption {
-        description = ''web-ui port
-
-        NOTE: once the initial config had been written to the state directory it will not be replaced
-        '';
-        type = int;
-        default = 5600;
-      };
-      initialConfigFile = mkOption {
-        description = ''
-          path inital WebServer.xml configuration if none exists
-        '';
-        type = nullOr path;
-        default = null;
-      };
-      # TODO: tlsPort
-      users = mkOption {
-        type = attrsOf (submodule ( { config, ... }: {
-          options = {
-            password = mkOption {
-              description = "password of user";
-              type = str;
-              apply = lib.removeSuffix "\n";
-            };
-            permissions = mkOption {
-              description = "user permissions";
-              type = str;
-              default = "admin";
-            };
-          };
-        }));
-      };
-    };
-  };
-
-  imp = let
-    genUsers = users: concatMapStringsSep "\n" (user: 
-      ''<WebUser Username="${user.name}" Password="${user.password}" LastLogin="0" Permissions="${user.permissions}"/>'' )
-      (mapAttrsToList (name: val: val // { inherit name; }) users);
-    webConfigFile = if (cfg.web.initialConfigFile == null) then builtins.trace "warning: airdcpp passwords are stored in plain text" pkgs.writeText "initial-config" ''
-      <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-      <WebServer>
-        <Config>
-          <Server Port="${toString cfg.web.port}"/>
-          <TLSServer Port="0" Certificate="" CertificateKey=""/>
-        </Config>
-        <WebUsers>${genUsers cfg.web.users}
-        </WebUsers>
-      </WebServer>
-      '' else cfg.web.initialConfigFile;
-    genHubs = hubs: concatMapStringsSep "\n" (hub:
-      ''<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);
-    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"?>
-        <Favorites>
-          <Hubs>
-            ${genHubs cfg.hubs}
-          </Hubs>
-        </Favorites>
-      '' else cfg.initialFavoritesConfigFile;
-    genShares = shares: concatMapStringsSep "\n" (share:
-      ''<Directory Virtual="stockholm" Incoming="${
-          if share.incoming then "1" else "0"
-        }" LastRefreshTime="0">${share.path}</Directory>'' )
-      (mapAttrsToList (name: val: val // { inherit name; }) shares);
-    dcppConfigFile = if (cfg.dcpp.initialConfigFile == null) then pkgs.writeText "initial-config" ''
-    <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-    <DCPlusPlus>
-      <Settings>
-        <Nick type="string">${cfg.dcpp.Nick}</Nick>
-        <InPort type="int">${toString cfg.dcpp.InPort}</InPort>
-        <UDPPort type="int">${toString cfg.dcpp.UDPPort}</UDPPort>
-        <TLSPort type="int">${toString cfg.dcpp.TLSPort}</TLSPort>
-        <AutoDetectIncomingConnection type="int">0</AutoDetectIncomingConnection>
-        <NoIpOverride type="int">1</NoIpOverride>
-        <WizardRunNew type="int">0</WizardRunNew>
-        <IPUpdate type="int">0</IPUpdate>
-        <AlwaysCCPM type="int">1</AlwaysCCPM>
-        <DownloadSpeed type="string">${cfg.dcpp.DownloadSpeed}</DownloadSpeed>
-        <UploadSpeed type="string">${cfg.dcpp.UploadSpeed}</UploadSpeed>
-      </Settings>
-      <Share Token="0" Name="Default">
-        ${genShares cfg.dcpp.shares}
-        <NoShare/>
-      </Share>
-      <ChatFilterItems/>
-    </DCPlusPlus>
-    '' else cfg.dcpp.initialConfigFile;
-  in {
-    systemd.services.airdcpp = {
-      description = "airdcpp webui";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      restartIfChanged = true;
-      serviceConfig = {
-        Type = "simple";
-        ExecStartPre = pkgs.writeDash "prepare-env" ''
-          d=${cfg.stateDir}/WebServer.xml
-          test -e $d || install -m700 -o${cfg.user} ${webConfigFile} $d
-          d=${cfg.stateDir}/DCPlusPlus.xml
-          test -e $d || install -m700 -o${cfg.user} ${dcppConfigFile} $d
-          d=${cfg.stateDir}/Favorites.xml
-          test -e $d || install -m700 -o${cfg.user} ${favoritesConfigFile} $d
-        '';
-        PermissionsStartOnly = true;
-        ExecStart = "${cfg.package}/bin/airdcppd -c=${cfg.stateDir} -p=${cfg.stateDir}/airdcpp.pid";
-        PrivateTmp = true;
-        WorkingDirectory = cfg.stateDir;
-        User = "${cfg.user}";
-      };
-    };
-    users = lib.mkIf (cfg.user == "airdcpp") {
-      users.airdcpp = {
-        uid = genid "airdcpp";
-        home = cfg.stateDir;
-        createHome = true;
-        inherit (cfg) extraGroups;
-      };
-      groups.airdcpp.gid = genid "airdcpp";
-    };
-  };
-in
-out
-
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
-- 
cgit v1.2.3