From 552a3e8f284e86fd1a8aec1182ef4d4ebeab8d0c Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 16 Mar 2017 20:56:28 +0100
Subject: k 3: add htgen

---
 krebs/3modules/htgen.nix | 68 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 krebs/3modules/htgen.nix

(limited to 'krebs/3modules/htgen.nix')

diff --git a/krebs/3modules/htgen.nix b/krebs/3modules/htgen.nix
new file mode 100644
index 000000000..2fe726049
--- /dev/null
+++ b/krebs/3modules/htgen.nix
@@ -0,0 +1,68 @@
+{ config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+let
+  cfg = config.krebs.htgen;
+
+  out = {
+    options.krebs.htgen = api;
+    config = imp;
+  };
+
+  api = mkOption {
+    type = types.attrsOf (types.submodule ({ config, ... }: {
+      options = {
+        enable = mkEnableOption "krebs.htgen-${config.name}";
+
+        name = mkOption {
+          type = types.username;
+          default = config._module.args.name;
+        };
+
+        port = mkOption {
+          type = types.uint;
+        };
+
+        script = mkOption {
+          type = types.str;
+        };
+        user = mkOption {
+          type = types.user;
+          default = {
+            name = "htgen-${config.name}";
+            home = "/var/lib/htgen-${config.name}";
+          };
+        };
+      };
+    }));
+  };
+  imp = {
+
+    systemd.services = mapAttrs' (name: htgen:
+      nameValuePair "htgen-${name}" {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        environment = {
+          HTGEN_PORT = toString htgen.port;
+        };
+        serviceConfig = {
+          SyslogIdentifier = "htgen";
+          User = htgen.user.name;
+          PrivateTmp = true;
+          Restart = "always";
+          ExecStart = "${pkgs.htgen.override {
+            inherit (htgen) script;
+          }}/bin/htgen --serve";
+        };
+      }
+    ) cfg;
+
+    users.users = mapAttrs' (name: htgen:
+      nameValuePair htgen.user.name {
+        inherit (htgen.user) home name uid;
+        createHome = true;
+      }
+    ) cfg;
+
+  };
+in out
-- 
cgit v1.2.3


From 5718517f60275a8dd66f3a230792e72bcc8d29c9 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 16 Mar 2017 21:53:34 +0100
Subject: k 3 htgen: use htgen-1.1

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

(limited to 'krebs/3modules/htgen.nix')

diff --git a/krebs/3modules/htgen.nix b/krebs/3modules/htgen.nix
index 2fe726049..3c8872be2 100644
--- a/krebs/3modules/htgen.nix
+++ b/krebs/3modules/htgen.nix
@@ -44,15 +44,14 @@ let
         after = [ "network.target" ];
         environment = {
           HTGEN_PORT = toString htgen.port;
+          HTGEN_SCRIPT = htgen.script;
         };
         serviceConfig = {
           SyslogIdentifier = "htgen";
           User = htgen.user.name;
           PrivateTmp = true;
           Restart = "always";
-          ExecStart = "${pkgs.htgen.override {
-            inherit (htgen) script;
-          }}/bin/htgen --serve";
+          ExecStart = "${pkgs.htgen}/bin/htgen --serve";
         };
       }
     ) cfg;
-- 
cgit v1.2.3


From 8809797f1063945c03ebd70666c108c45d5d724a Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 16 Mar 2017 22:12:11 +0100
Subject: k 3 htgen: add default option

---
 krebs/3modules/htgen.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/3modules/htgen.nix')

diff --git a/krebs/3modules/htgen.nix b/krebs/3modules/htgen.nix
index 3c8872be2..0dddca6c8 100644
--- a/krebs/3modules/htgen.nix
+++ b/krebs/3modules/htgen.nix
@@ -10,6 +10,7 @@ let
   };
 
   api = mkOption {
+    default = {};
     type = types.attrsOf (types.submodule ({ config, ... }: {
       options = {
         enable = mkEnableOption "krebs.htgen-${config.name}";
-- 
cgit v1.2.3