Merge remote-tracking branch 'prism/master'

6 files changed, 192 insertions, 170 deletions

diff --git a/krebs/3modules/exim-retiolum.nix b/krebs/3modules/exim-retiolum.nix
index d6b7ab75..a18f1c97 100644
--- a/krebs/3modules/exim-retiolum.nix
+++ b/krebs/3modules/exim-retiolum.nix
@@ -37,7 +37,7 @@ let
       config =
         # This configuration makes only sense for retiolum-enabled hosts.
         # TODO modular configuration
-        assert config.krebs.retiolum.enable;
+        assert config.krebs.tinc.retiolum.enable;
         ''
           keep_environment =
 
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index d5537cf5..52db3de8 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -259,8 +259,13 @@ with config.krebs.lib;
     };
     filepimp = rec {
       cores = 1;
-
       nets = {
+        lan = {
+          ip4.addr = "192.168.1.12";
+          aliases = [
+            "filepimp.lan"
+          ];
+        };
         retiolum = {
           ip4.addr = "10.243.153.102";
           ip6.addr = "42:4b0b:d990:55ba:8da8:630f:dc0e:aae0";
@@ -286,6 +291,12 @@ with config.krebs.lib;
       cores = 2;
 
       nets = {
+        lan = {
+          ip4.addr = "192.168.1.11";
+          aliases = [
+            "omo.lan"
+          ];
+        };
         retiolum = {
           ip4.addr = "10.243.0.89";
           ip6.addr = "42:f9f0::10";
diff --git a/krebs/3modules/retiolum-bootstrap.nix b/krebs/3modules/retiolum-bootstrap.nix
index 40382d09..9d393c90 100644
--- a/krebs/3modules/retiolum-bootstrap.nix
+++ b/krebs/3modules/retiolum-bootstrap.nix
@@ -27,12 +27,12 @@ let
     ssl_certificate_key = mkOption {
         type = types.str;
         description = "Certificate key to use for ssl";
-        default = "/root/secrets/tinc.krebsco.de.key";
+        default = "${toString <secrets>}/tinc.krebsco.de.key";
     };
     ssl_certificate = mkOption {
         type = types.str;
         description = "Certificate file to use for ssl";
-        default = "/root/secrets/tinc.krebsco.de.crt" ;
+        default = "${toString <secrets>}/tinc.krebsco.de.crt" ;
     };
     # in use:
     #  <secrets/tinc.krebsco.de.crt>
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 22991f09..0bd81521 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -1,175 +1,185 @@
 { config, pkgs, lib, ... }:
 with config.krebs.lib;
 let
-  cfg = config.krebs.retiolum;
-
   out = {
-    options.krebs.retiolum = api;
-    config = lib.mkIf cfg.enable imp;
+    options.krebs.tinc = api;
+    config = imp;
   };
 
-  api = {
-    enable = mkEnableOption "krebs.retiolum";
-
-    host = mkOption {
-      type = types.host;
-      default = config.krebs.build.host;
-    };
-
-    netname = mkOption {
-      type = types.enum (attrNames cfg.host.nets);
-      default = "retiolum";
-      description = ''
-        The tinc network name.
-        It is used to name the TUN device and to generate the default value for
-        <literal>config.krebs.retiolum.hosts</literal>.
-      '';
-    };
-
-    extraConfig = mkOption {
-      type = types.str;
-      default = "";
-      description = ''
-        Extra Configuration to be appended to tinc.conf
-      '';
-    };
-
-    tincPackage = mkOption {
-      type = types.package;
-      default = pkgs.tinc;
-      description = "Tincd package to use.";
-    };
-
-    hosts = mkOption {
-      type = with types; attrsOf host;
-      default =
-        filterAttrs (_: h: hasAttr cfg.netname h.nets) config.krebs.hosts;
-      description = ''
-        Hosts to generate <literal>config.krebs.retiolum.hostsPackage</literal>.
-        Note that these hosts must have a network named
-        <literal>config.krebs.retiolum.netname</literal>.
-      '';
-    };
-
-    hostsPackage = mkOption {
-      type = types.package;
-      default = pkgs.stdenv.mkDerivation {
-        name = "${cfg.netname}-tinc-hosts";
-        phases = [ "installPhase" ];
-        installPhase = ''
-          mkdir $out
-          ${concatStrings (mapAttrsToList (_: host: ''
-            echo ${shell.escape host.nets.${cfg.netname}.tinc.config} \
-              > $out/${shell.escape host.name}
-          '') cfg.hosts)}
-        '';
-      };
-      description = ''
-        Package of tinc host configuration files.  By default, a package will
-        be generated from <literal>config.krebs.retiolum.hosts</literal>.  This
-        option's main purpose is to expose the generated hosts package to other
-        modules, like <literal>config.krebs.tinc_graphs</literal>.  But it can
-        also be used to provide a custom hosts directory.
-      '';
-      example = literalExample ''
-        (pkgs.stdenv.mkDerivation {
-          name = "my-tinc-hosts";
-          src = /home/tv/my-tinc-hosts;
-          installPhase = "cp -R . $out";
-        })
-      '';
-    };
-
-    iproutePackage = mkOption {
-      type = types.package;
-      default = pkgs.iproute;
-      description = "Iproute2 package to use.";
-    };
-
-    privkey = mkOption {
-      type = types.secret-file;
-      default = {
-        path = "${cfg.user.home}/tinc.rsa_key.priv";
-        owner = cfg.user;
-        source-path = toString <secrets> + "/${cfg.netname}.rsa_key.priv";
-      };
-    };
-
-    connectTo = mkOption {
-      type = types.listOf types.str;
-      default = [ "fastpoke" "cd" "prism" "gum" ];
-      description = ''
-        The list of hosts in the network which the client will try to connect
-        to.  These hosts should have an 'Address' configured which points to a
-        routeable IPv4 or IPv6 address.
-
-        In stockholm this can be done by configuring:
-          krebs.hosts.${connect-host}.nets.${netname?"retiolum"}.via.addrs4 =
-            [ "${external-ip} ${external-port}" ]
-      '';
-    };
-
-    user = mkOption {
-      type = types.user;
-      default = {
-        name = cfg.netname;
-        home = "/var/lib/${cfg.user.name}";
+  api = mkOption {
+    default = {};
+    description = ''
+      define a tinc network
+    '';
+    type = with types; attrsOf (submodule (tinc: {
+      options = {
+
+        enable = mkEnableOption "krebs.tinc.${tinc.config._module.args.name}" // { default = true; };
+
+        host = mkOption {
+          type = types.host;
+          default = config.krebs.build.host;
+        };
+
+        netname = mkOption {
+          type = types.enum (attrNames tinc.config.host.nets);
+          default = tinc.config._module.args.name;
+          description = ''
+            The tinc network name.
+            It is used to name the TUN device and to generate the default value for
+            <literal>config.krebs.tinc.retiolum.hosts</literal>.
+          '';
+        };
+
+        extraConfig = mkOption {
+          type = types.str;
+          default = "";
+          description = ''
+            Extra Configuration to be appended to tinc.conf
+          '';
+        };
+
+        tincPackage = mkOption {
+          type = types.package;
+          default = pkgs.tinc;
+          description = "Tincd package to use.";
+        };
+
+        hosts = mkOption {
+          type = with types; attrsOf host;
+          default =
+            filterAttrs (_: h: hasAttr tinc.config.netname h.nets) config.krebs.hosts;
+          description = ''
+            Hosts to generate <literal>config.krebs.tinc.retiolum.hostsPackage</literal>.
+            Note that these hosts must have a network named
+            <literal>config.krebs.tinc.retiolum.netname</literal>.
+          '';
+        };
+
+        hostsPackage = mkOption {
+          type = types.package;
+          default = pkgs.stdenv.mkDerivation {
+            name = "${tinc.config.netname}-tinc-hosts";
+            phases = [ "installPhase" ];
+            installPhase = ''
+              mkdir $out
+              ${concatStrings (lib.mapAttrsToList (_: host: ''
+                echo ${shell.escape host.nets."${tinc.config.netname}".tinc.config} \
+                  > $out/${shell.escape host.name}
+              '') tinc.config.hosts)}
+            '';
+          };
+          description = ''
+            Package of tinc host configuration files.  By default, a package will
+            be generated from <literal>config.krebs.${tinc.config.netname}.hosts</literal>.  This
+            option's main purpose is to expose the generated hosts package to other
+            modules, like <literal>config.krebs.tinc_graphs</literal>.  But it can
+            also be used to provide a custom hosts directory.
+          '';
+          example = literalExample ''
+            (pkgs.stdenv.mkDerivation {
+              name = "my-tinc-hosts";
+              src = /home/tv/my-tinc-hosts;
+              installPhase = "cp -R . $out";
+            })
+          '';
+        };
+
+        iproutePackage = mkOption {
+          type = types.package;
+          default = pkgs.iproute;
+          description = "Iproute2 package to use.";
+        };
+
+        privkey = mkOption {
+          type = types.secret-file;
+          default = {
+            path = "${tinc.config.user.home}/tinc.rsa_key.priv";
+            owner = tinc.config.user;
+            source-path = toString <secrets> + "/${tinc.config.netname}.rsa_key.priv";
+          };
+        };
+
+        connectTo = mkOption {
+          type = types.listOf types.str;
+          default = [ "fastpoke" "cd" "prism" "gum" ];
+          description = ''
+            The list of hosts in the network which the client will try to connect
+            to.  These hosts should have an 'Address' configured which points to a
+            routeable IPv4 or IPv6 address.
+
+            In stockholm this can be done by configuring:
+              krebs.hosts.${connect-host}.nets.${netname?"retiolum"}.via.addrs4 =
+                [ "${external-ip} ${external-port}" ]
+          '';
+        };
+
+        user = mkOption {
+          type = types.user;
+          default = {
+            name = tinc.config.netname;
+            home = "/var/lib/${tinc.config.user.name}";
+          };
+        };
       };
-    };
+    }));
   };
 
   imp = {
-    krebs.secret.files."${cfg.netname}.rsa_key.priv" = cfg.privkey;
-
-    environment.systemPackages = [ tinc iproute ];
-
-    systemd.services.${cfg.netname} = {
-      description = "Tinc daemon for Retiolum";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      requires = [ "secret.service" ];
-      path = [ tinc iproute ];
-      serviceConfig = rec {
-        Restart = "always";
-        ExecStart = "${tinc}/sbin/tincd -c ${confDir} -d 0 -U ${cfg.user.name} -D --pidfile=/var/run/tinc.${SyslogIdentifier}.pid";
-        SyslogIdentifier = cfg.netname;
-      };
-    };
-
-    users.users.${cfg.user.name} = {
-      inherit (cfg.user) home name uid;
-      createHome = true;
-    };
+    # TODO `environment.systemPackages = [ cfg.tincPackage cfg.iproutePackage ]` for each network,
+    # avoid conflicts in environment if the packages differ
+
+    krebs.secret.files = mapAttrs' (netname: cfg:
+      nameValuePair "${netname}.rsa_key.priv" cfg.privkey ) config.krebs.tinc;
+    users.users = mapAttrs' (netname: cfg:
+      nameValuePair "${netname}" {
+        inherit (cfg.user) home name uid;
+        createHome = true;
+      }
+    ) config.krebs.tinc;
+
+    systemd.services = mapAttrs (netname: cfg:
+      let
+        net = cfg.host.nets.${netname};
+        tinc = cfg.tincPackage;
+        iproute = cfg.iproutePackage;
+
+        confDir = let
+          namePathPair = name: path: { inherit name path; };
+        in pkgs.linkFarm "${netname}-etc-tinc" (mapAttrsToList namePathPair {
+            "hosts" = cfg.hostsPackage;
+            "tinc.conf" = pkgs.writeText "${cfg.netname}-tinc.conf" ''
+              Name = ${cfg.host.name}
+              Interface = ${netname}
+              ${concatStrings (map (c: "ConnectTo = ${c}\n") cfg.connectTo)}
+              PrivateKeyFile = ${cfg.privkey.path}
+              ${cfg.extraConfig}
+            '';
+            "tinc-up" = pkgs.writeDash "${netname}-tinc-up" ''
+              ${iproute}/sbin/ip link set ${netname} up
+              ${optionalString (net.ip4 != null) /* sh */ ''
+                ${iproute}/sbin/ip -4 addr add ${net.ip4.addr} dev ${netname}
+                ${iproute}/sbin/ip -4 route add ${net.ip4.prefix} dev ${netname}
+              ''}
+              ${optionalString (net.ip6 != null) /* sh */ ''
+                ${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${netname}
+                ${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${netname}
+              ''}
+            '';
+          }
+        );
+      in {
+        description = "Tinc daemon for ${netname}";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        requires = [ "secret.service" ];
+        path = [ tinc iproute ];
+        serviceConfig = rec {
+          Restart = "always";
+          ExecStart = "${tinc}/sbin/tincd -c ${confDir} -d 0 -U ${cfg.user.name} -D --pidfile=/var/run/tinc.${SyslogIdentifier}.pid";
+          SyslogIdentifier = netname;
+        };
+      }
+    ) config.krebs.tinc;
   };
-
-  net = cfg.host.nets.${cfg.netname};
-
-  tinc = cfg.tincPackage;
-
-  iproute = cfg.iproutePackage;
-
-  confDir = let
-    namePathPair = name: path: { inherit name path; };
-  in pkgs.linkFarm "${cfg.netname}-etc-tinc" (mapAttrsToList namePathPair {
-    "hosts" = cfg.hostsPackage;
-    "tinc.conf" = pkgs.writeText "${cfg.netname}-tinc.conf" ''
-      Name = ${cfg.host.name}
-      Interface = ${cfg.netname}
-      ${concatStrings (map (c: "ConnectTo = ${c}\n") cfg.connectTo)}
-      PrivateKeyFile = ${cfg.privkey.path}
-      ${cfg.extraConfig}
-    '';
-    "tinc-up" = pkgs.writeDash "${cfg.netname}-tinc-up" ''
-      ${iproute}/sbin/ip link set ${cfg.netname} up
-      ${optionalString (net.ip4 != null) /* sh */ ''
-        ${iproute}/sbin/ip -4 addr add ${net.ip4.addr} dev ${cfg.netname}
-        ${iproute}/sbin/ip -4 route add ${net.ip4.prefix} dev ${cfg.netname}
-      ''}
-      ${optionalString (net.ip6 != null) /* sh */ ''
-        ${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${cfg.netname}
-        ${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${cfg.netname}
-      ''}
-    '';
-  });
-
 in out
diff --git a/krebs/3modules/tinc_graphs.nix b/krebs/3modules/tinc_graphs.nix
index 0f1bae09..d783ba03 100644
--- a/krebs/3modules/tinc_graphs.nix
+++ b/krebs/3modules/tinc_graphs.nix
@@ -23,7 +23,7 @@ let
     hostsPath = mkOption {
       type = types.str;
       description = "Path to Hosts directory";
-      default = "${config.krebs.retiolum.hostsPackage}";
+      default = "${config.krebs.tinc.retiolum.hostsPackage}";
     };
 
     network = mkOption {
diff --git a/krebs/5pkgs/fortclientsslvpn/default.nix b/krebs/5pkgs/fortclientsslvpn/default.nix
index 11d56740..07420c4d 100644
--- a/krebs/5pkgs/fortclientsslvpn/default.nix
+++ b/krebs/5pkgs/fortclientsslvpn/default.nix
@@ -5,9 +5,10 @@ stdenv.mkDerivation rec {
   # forticlient will be copied into /tmp before execution. this is necessary as
   # the software demands $base to be writeable
 
+  # TODO: chroot and create the following files instead of copying files manually
   # mkdir /etc/ppp ; touch /etc/ppp/options
-  ## i still have not found which tool uses tail ... i tried redirecting it in forticlientsslvpn and subproc
   # ln -s /run/current-system/sw/bin/tail /usr/bin/tail
+  # ln -s /run/current-system/sw/bin/pppd /usr/sbin/pppd
 
   src = fetchurl {
     # archive.org mirror:
@@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
     cp -r 64bit/. "$out/opt/fortinet"
     wrapProgram $out/opt/fortinet/forticlientsslvpn \
       --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-      --set NIX_REDIRECTS /usr/sbin/ip=${iproute}/bin/ip:/usr/sbin/ppp=${ppp}/bin/ppp
+      --set NIX_REDIRECTS /usr/bin/tail=${coreutils}/bin/tail:/usr/sbin/ip=${iproute}/bin/ip:/usr/sbin/pppd=${ppp}/bin/pppd
 
     mkdir -p "$out/bin/"