From 504b1b90e809934a01357450ccdf35c4e4afc74d Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 23 Jul 2015 00:37:21 +0200 Subject: * tv identity: define type harder --- 4lib/tv/default.nix | 64 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 4 deletions(-) (limited to '4lib') diff --git a/4lib/tv/default.nix b/4lib/tv/default.nix index 164a6a1aa..6985baa90 100644 --- a/4lib/tv/default.nix +++ b/4lib/tv/default.nix @@ -1,12 +1,10 @@ { lib, pkgs, ... }: with builtins; +with lib; -let - inherit (lib) mapAttrs stringAsChars; -in +builtins // lib // rec { -rec { git = import ./git.nix { lib = lib // { inherit addNames; @@ -59,4 +57,62 @@ rec { else if c == "\n" then "'\n'" else "\\${c}"); + types = lib.types // (with lib.types; rec { + + host = submodule { + options = { + name = mkOption { + type = label; + }; + dc = mkOption { + type = label; + }; + cores = mkOption { + type = positive; + }; + nets = mkOption { + type = attrsOf net; + apply = x: assert hasAttr "retiolum" x; x; + }; + search = mkOption { + type = hostname; + }; + }; + }; + + net = submodule ({ config, ... }: { + options = { + addrs = mkOption { + type = listOf addr; + apply = _: config.addrs4 ++ config.addrs6; + }; + addrs4 = mkOption { + type = listOf addr4; + default = []; + }; + addrs6 = mkOption { + type = listOf addr6; + default = []; + }; + aliases = mkOption { + # TODO nonEmptyListOf hostname + type = listOf hostname; + }; + }; + }); + + positive = mkOptionType { + name = "positive integer"; + check = x: isInt x && x > 0; + merge = mergeOneOption; + }; + + # TODO + addr = str; + addr4 = str; + addr6 = str; + hostname = str; + label = str; + }); + } -- cgit v1.3.1 From 8e41a4be471cd9bb74c8667140a70f8c05c363d4 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 23 Jul 2015 01:02:36 +0200 Subject: * tv identity: hosts.*.search -> search --- 2configs/tv/identity.nix | 6 +----- 3modules/tv/identity.nix | 14 +++++++++----- 4lib/tv/default.nix | 6 ------ 3 files changed, 10 insertions(+), 16 deletions(-) (limited to '4lib') diff --git a/2configs/tv/identity.nix b/2configs/tv/identity.nix index 312c59d8d..36b387cdd 100644 --- a/2configs/tv/identity.nix +++ b/2configs/tv/identity.nix @@ -4,6 +4,7 @@ imports = [ ../../3modules/tv/identity.nix ]; tv.identity = { enable = true; + search = "retiolum"; hosts = { cd = { cores = 2; @@ -27,7 +28,6 @@ ]; }; }; - search = "retiolum"; }; mkdir = { cores = 1; @@ -41,7 +41,6 @@ ]; }; }; - search = "retiolum"; }; nomic = { cores = 2; @@ -55,7 +54,6 @@ ]; }; }; - search = "retiolum"; }; rmdir = { cores = 1; @@ -70,7 +68,6 @@ ]; }; }; - search = "retiolum"; }; wu = { cores = 4; @@ -84,7 +81,6 @@ ]; }; }; - search = "retiolum"; }; }; }; diff --git a/3modules/tv/identity.nix b/3modules/tv/identity.nix index 0b94dff85..584b27165 100644 --- a/3modules/tv/identity.nix +++ b/3modules/tv/identity.nix @@ -16,15 +16,19 @@ let type = types.host; }; - others = mkOption { - type = types.host; - default = filterAttrs (name: _host: name != cfg.self.name) cfg.hosts; - }; + #others = mkOption { + # type = types.host; + # default = filterAttrs (name: _host: name != cfg.self.name) cfg.hosts; + #}; hosts = mkOption { type = with types; attrsOf host; apply = mapAttrs (name: value: value // { inherit name; }); }; + + search = mkOption { + type = types.hostname; + }; }; imp = { @@ -36,7 +40,7 @@ let let aliases = toString (unique (longs ++ shorts)); longs = (splitByProvider net.aliases).hosts; - shorts = map (removeSuffix ".${cfg.self.search}") longs; + shorts = map (removeSuffix ".${cfg.search}") longs; in map (addr: "${addr} ${aliases}") net.addrs ) host.nets diff --git a/4lib/tv/default.nix b/4lib/tv/default.nix index 6985baa90..c134745d6 100644 --- a/4lib/tv/default.nix +++ b/4lib/tv/default.nix @@ -39,9 +39,6 @@ builtins // lib // rec { in xsn >= sn && substring (xsn - sn) sn xs == s ; - removeSuffix = - s : xs : substring 0 (stringLength xs - stringLength s) xs; - # setMap :: (String -> a -> b) -> Set String a -> [b] #setMap = f: xs: map (k : f k (getAttr k xs)) (attrNames xs); @@ -74,9 +71,6 @@ builtins // lib // rec { type = attrsOf net; apply = x: assert hasAttr "retiolum" x; x; }; - search = mkOption { - type = hostname; - }; }; }; -- cgit v1.3.1 From d97be4322371f06b423e308b606824c02f1a67af Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 23 Jul 2015 01:25:26 +0200 Subject: * tv identity: add tinc public keys --- 2configs/tv/identity.nix | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 4lib/tv/default.nix | 3 +++ 2 files changed, 61 insertions(+) (limited to '4lib') diff --git a/2configs/tv/identity.nix b/2configs/tv/identity.nix index 36b387cdd..1a02876f8 100644 --- a/2configs/tv/identity.nix +++ b/2configs/tv/identity.nix @@ -26,6 +26,21 @@ "cd.retiolum" "cgit.cd.retiolum" ]; + tinc-key = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAvmCBVNKT/Su4v9nl/Nm3STPo5QxWPg7xEkzIs3Oh39BS8+r6/7UQ + rebib7mczb+ebZd+Rg2yFoGrWO8cmM0VcLy5bYRMK7in8XroLEjWecNNM4TRfNR4 + e53+LhcPdkxo0A3/D+yiut+A2Mkqe+4VXDm/JhAiAYkZTn7jUtj00Atrc7CWW1gN + sP3jIgv4+CGftdSYOB4dm699B7OD9XDLci2kOaFqFl4cjDYUok03G0AduUlRx10v + CKbKOTIdm8C36A902/3ms+Hyzkruu+VagGIZuPSwqXHJPCu7Ju+jarKQstMmpQi0 + PubweWDL0o/Dfz2qT3DuL4xDecIvGE6kv3m41hHJYiK+2/azTSehyPFbsVbL7w0V + LgKN3usnZNcpTsBWxRGT7nMFSnX2FLDu7d9OfCuaXYxHVFLZaNrpccOq8NF/7Hbk + DDW81W7CvLyJDlp0WLnAawSOGTUTPoYv/2wAapJ89i8QGCueGvEc6o2EcnBVMFEW + ejWTQzyD816f4RsplnrRqLVlIMbr9Q/n5TvlgjjhX7IMEfMy4+7qLGRQkNbFzgwK + jxNG2fFSCjOEQitm0gAtx7QRIyvYr6c7/xiHz4AwxYzBmvQsL/OK57NO4+Krwgj5 + Vk8TQ2jGO7J4bB38zaxK+Lrtfl8i1AK1171JqFMhOc34JSJ7T4LWDMECAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; }; }; }; @@ -35,10 +50,21 @@ nets = { retiolum = { addrs4 = ["10.243.113.223"]; + addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af4"]; aliases = [ "mkdir.retiolum" "cgit.mkdir.retiolum" ]; + tinc-key = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAuyfM+3od75zOYXqnqRMAt+yp/4z/vC3vSWdjUvEmCuM23c5BOBw+ + dKqbWoSPTzOuaQ0szdL7a6YxT+poSUXd/i3pPz59KgCl192rd1pZoJKgvoluITev + voYSP9rFQOUrustfDb9qKW/ZY95cwdCvypo7Vf4ghxwDCnlmyCGz7qXTJMLydNKF + 2PH9KiY4suv15sCg/zisu+q0ZYQXUc1TcgpoIYBOftDunOJoNdbti+XjwWdjGmJZ + Bn4GelsrrpwJFvfDmouHUe8GsD7nTgbZFtiJbKfCEiK16N0Q0d0ZFHhAV2nPjsk2 + 3JhG4n9vxATBkO82f7RLrcrhkx9cbLfN3wIDAQAB + -----END RSA PUBLIC KEY----- + ''; }; }; }; @@ -48,10 +74,21 @@ nets = { retiolum = { addrs4 = ["10.243.0.110"]; + addrs6 = ["42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec"]; aliases = [ "nomic.retiolum" "cgit.nomic.retiolum" ]; + tinc-key = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+ + qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw + Kd4tHVdoQgJW5yFepmT9IUmHqkxXJ0R2W93l2eSZNOcnFvFn0ooiAlRi4zAiHClu + 5Mz80Sc2rvez+n9wtC2D06aYjP23pHYld2xighHR9SUqX1dFzgSXNSoWWCcgNp2a + OKcM8LzxLV7MTMZFOJCJndZ77e4LsUvxhQFP6nyKZWg30PC0zufZsuN5o2xsWSlA + Wi9sMB1AUR6mZrxgcgTFpUjbjbLQf+36CwIDAQAB + -----END RSA PUBLIC KEY----- + ''; }; }; }; @@ -66,6 +103,16 @@ "rmdir.retiolum" "cgit.rmdir.retiolum" ]; + tinc-key = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEA+twy4obSbJdmZLfBoe9YYeyoDnXkO/WPa2D6Eh6jXrWk5fbhBjRf + i3EAQfLiXXFJX3E8V8YvJyazXklI19jJtCLDiu/F5kgJJfyAkWHH+a/hcg7qllDM + Xx2CvS/nCbs+p48/VLO6zLC7b1oHu3K/ob5M5bwPK6j9NEDIL5qYiM5PQzV6zryz + hS9E/+l8Z+UUpYcfS3bRovXJAerB4txc/gD3Xmptq1zk53yn1kJFYfVlwyyz+NEF + 59JZj2PDrvWoG0kx/QjiNurs6XfdnyHe/gP3rmSTrihKFVuA3cZM62sDR4FcaeWH + SnKSp02pqjBOjC/dOK97nXpKLJgNH046owIDAQAB + -----END RSA PUBLIC KEY----- + ''; }; }; }; @@ -76,9 +123,20 @@ nets = { retiolum = { addrs4 = ["10.243.13.37"]; + addrs6 = ["42:0:0:0:0:0:0:1337"]; aliases = [ "wu.retiolum" ]; + tinc-key = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEArDvU0cuBsVqTjCX2TlWL4XHSy4qSjUhjrDvUPZSKTVN7x6OENCUn + M27g9H7j4/Jw/8IHoJLiKnXHavOoc9UJM+P9Fla/4TTVADr69UDSnLgH+wGiHcEg + GxPkb2jt0Z8zcpD6Fusj1ATs3sssaLHTHvg1D0LylEWA3cI4WPP13v23PkyUENQT + KpSWfR+obqDl38Q7LuFi6dH9ruyvqK+4syddrBwjPXrcNxcGL9QbDn7+foRNiWw4 + 4CE5z25oGG2iWMShI7fe3ji/fMUAl7DSOOrHVVG9eMtpzy+uI8veOHrdTax4oKik + AFGCrMIov3F0GIeu3nDlrTIZPZDTodbFKQIDAQAB + -----END RSA PUBLIC KEY----- + ''; }; }; }; diff --git a/4lib/tv/default.nix b/4lib/tv/default.nix index c134745d6..ec46d8ea8 100644 --- a/4lib/tv/default.nix +++ b/4lib/tv/default.nix @@ -92,6 +92,9 @@ builtins // lib // rec { # TODO nonEmptyListOf hostname type = listOf hostname; }; + tinc-key = mkOption { + type = str; + }; }; }); -- cgit v1.3.1 From 7a40f89e01593adff35f943aa86492ac4281d4e8 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 23 Jul 2015 01:56:46 +0200 Subject: 4 tv: generate tinc config --- 1systems/tv/mkdir.nix | 2 +- 2configs/tv/identity.nix | 27 ++++++++++++++++++--------- 4lib/tv/default.nix | 23 +++++++++++++++++++++-- 3 files changed, 40 insertions(+), 12 deletions(-) (limited to '4lib') diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix index 2e90c8acd..e0e057d63 100644 --- a/1systems/tv/mkdir.nix +++ b/1systems/tv/mkdir.nix @@ -46,7 +46,7 @@ with lib; networking.hostName = "mkdir"; networking.interfaces.enp2s1.ip4 = [ { - address = "162.248.167.241"; + address = "162.248.167.241"; # TODO prefixLength = 24; } ]; diff --git a/2configs/tv/identity.nix b/2configs/tv/identity.nix index 1a02876f8..de99f507f 100644 --- a/2configs/tv/identity.nix +++ b/2configs/tv/identity.nix @@ -9,7 +9,7 @@ cd = { cores = 2; dc = "tv"; #dc = "cac"; - nets = { + nets = rec { internet = { addrs4 = ["162.219.7.216"]; aliases = [ @@ -20,13 +20,14 @@ ]; }; retiolum = { + via = internet; addrs4 = ["10.243.113.222"]; addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af3"]; aliases = [ "cd.retiolum" "cgit.cd.retiolum" ]; - tinc-key = '' + tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAvmCBVNKT/Su4v9nl/Nm3STPo5QxWPg7xEkzIs3Oh39BS8+r6/7UQ rebib7mczb+ebZd+Rg2yFoGrWO8cmM0VcLy5bYRMK7in8XroLEjWecNNM4TRfNR4 @@ -47,15 +48,19 @@ mkdir = { cores = 1; dc = "tv"; #dc = "cac"; - nets = { + nets = rec { + internet = { + addrs4 = ["162.248.167.241"]; + }; retiolum = { + via = internet; addrs4 = ["10.243.113.223"]; addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af4"]; aliases = [ "mkdir.retiolum" "cgit.mkdir.retiolum" ]; - tinc-key = '' + tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAuyfM+3od75zOYXqnqRMAt+yp/4z/vC3vSWdjUvEmCuM23c5BOBw+ dKqbWoSPTzOuaQ0szdL7a6YxT+poSUXd/i3pPz59KgCl192rd1pZoJKgvoluITev @@ -71,7 +76,7 @@ nomic = { cores = 2; dc = "tv"; #dc = "gg23"; - nets = { + nets = rec { retiolum = { addrs4 = ["10.243.0.110"]; addrs6 = ["42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec"]; @@ -79,7 +84,7 @@ "nomic.retiolum" "cgit.nomic.retiolum" ]; - tinc-key = '' + tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+ qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw @@ -95,15 +100,19 @@ rmdir = { cores = 1; dc = "tv"; #dc = "cac"; - nets = { + nets = rec { + internet = { + addrs4 = ["167.88.44.94"]; + }; retiolum = { + via = internet; addrs4 = ["10.243.113.224"]; addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af5"]; aliases = [ "rmdir.retiolum" "cgit.rmdir.retiolum" ]; - tinc-key = '' + tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA+twy4obSbJdmZLfBoe9YYeyoDnXkO/WPa2D6Eh6jXrWk5fbhBjRf i3EAQfLiXXFJX3E8V8YvJyazXklI19jJtCLDiu/F5kgJJfyAkWHH+a/hcg7qllDM @@ -127,7 +136,7 @@ aliases = [ "wu.retiolum" ]; - tinc-key = '' + tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEArDvU0cuBsVqTjCX2TlWL4XHSy4qSjUhjrDvUPZSKTVN7x6OENCUn M27g9H7j4/Jw/8IHoJLiKnXHavOoc9UJM+P9Fla/4TTVADr69UDSnLgH+wGiHcEg diff --git a/4lib/tv/default.nix b/4lib/tv/default.nix index ec46d8ea8..5eb9ac45f 100644 --- a/4lib/tv/default.nix +++ b/4lib/tv/default.nix @@ -76,6 +76,10 @@ builtins // lib // rec { net = submodule ({ config, ... }: { options = { + via = mkOption { + type = nullOr net; + default = null; + }; addrs = mkOption { type = listOf addr; apply = _: config.addrs4 ++ config.addrs6; @@ -92,8 +96,23 @@ builtins // lib // rec { # TODO nonEmptyListOf hostname type = listOf hostname; }; - tinc-key = mkOption { - type = str; + tinc = mkOption { + type = submodule { + options = { + config = mkOption { + type = str; + apply = _: '' + ${optionalString (config.via != null) + (concatMapStringsSep "\n" (a: "Address = ${a}") config.via.addrs)} + ${concatMapStringsSep "\n" (a: "Subnet = ${a}") config.addrs} + ${config.tinc.pubkey} + ''; + }; + pubkey = mkOption { + type = str; + }; + }; + }; }; }; }); -- cgit v1.3.1 From 791a7e79977de76908ab9e33eb64cbd2b02da3ed Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 23 Jul 2015 02:00:23 +0200 Subject: 4 tv: tinc.config can access tinc.pubkey --- 4lib/tv/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '4lib') diff --git a/4lib/tv/default.nix b/4lib/tv/default.nix index 5eb9ac45f..092a9626c 100644 --- a/4lib/tv/default.nix +++ b/4lib/tv/default.nix @@ -97,22 +97,22 @@ builtins // lib // rec { type = listOf hostname; }; tinc = mkOption { - type = submodule { + type = let net-config = config; in submodule ({ config, ... }: { options = { config = mkOption { type = str; apply = _: '' - ${optionalString (config.via != null) - (concatMapStringsSep "\n" (a: "Address = ${a}") config.via.addrs)} - ${concatMapStringsSep "\n" (a: "Subnet = ${a}") config.addrs} - ${config.tinc.pubkey} + ${optionalString (net-config.via != null) + (concatMapStringsSep "\n" (a: "Address = ${a}") net-config.via.addrs)} + ${concatMapStringsSep "\n" (a: "Subnet = ${a}") net-config.addrs} + ${config.pubkey} ''; }; pubkey = mkOption { type = str; }; }; - }; + }); }; }; }); -- cgit v1.3.1