Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

4 tv: generate tinc config

Browse Source
This commit is contained in:
tv 2015-07-23 01:56:46 +02:00
parent d97be43223
commit 7a40f89e01
3 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
1systems/tv/mkdir.nix
View File

@ -46,7 +46,7 @@ with lib;
networking.hostName = "mkdir"; networking.hostName = "mkdir";
networking.interfaces.enp2s1.ip4 = [ networking.interfaces.enp2s1.ip4 = [
{ {
address = "162.248.167.241"; address = "162.248.167.241"; # TODO
prefixLength = 24; prefixLength = 24;
} }
]; ];

27
2configs/tv/identity.nix
View File

@ -9,7 +9,7 @@
cd = { cd = {
cores = 2; cores = 2;
dc = "tv"; #dc = "cac"; dc = "tv"; #dc = "cac";
nets = { nets = rec {
internet = { internet = {
addrs4 = ["162.219.7.216"]; addrs4 = ["162.219.7.216"];
aliases = [ aliases = [
@ -20,13 +20,14 @@
]; ];
}; };
retiolum = { retiolum = {
via = internet;
addrs4 = ["10.243.113.222"]; addrs4 = ["10.243.113.222"];
addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af3"]; addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af3"];
aliases = [ aliases = [
"cd.retiolum" "cd.retiolum"
"cgit.cd.retiolum" "cgit.cd.retiolum"
]; ];
tinc-key = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEAvmCBVNKT/Su4v9nl/Nm3STPo5QxWPg7xEkzIs3Oh39BS8+r6/7UQ MIICCgKCAgEAvmCBVNKT/Su4v9nl/Nm3STPo5QxWPg7xEkzIs3Oh39BS8+r6/7UQ
rebib7mczb+ebZd+Rg2yFoGrWO8cmM0VcLy5bYRMK7in8XroLEjWecNNM4TRfNR4 rebib7mczb+ebZd+Rg2yFoGrWO8cmM0VcLy5bYRMK7in8XroLEjWecNNM4TRfNR4
@ -47,15 +48,19 @@
mkdir = { mkdir = {
cores = 1; cores = 1;
dc = "tv"; #dc = "cac"; dc = "tv"; #dc = "cac";
nets = { nets = rec {
internet = {
addrs4 = ["162.248.167.241"];
};
retiolum = { retiolum = {
via = internet;
addrs4 = ["10.243.113.223"]; addrs4 = ["10.243.113.223"];
addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af4"]; addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af4"];
aliases = [ aliases = [
"mkdir.retiolum" "mkdir.retiolum"
"cgit.mkdir.retiolum" "cgit.mkdir.retiolum"
]; ];
tinc-key = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAuyfM+3od75zOYXqnqRMAt+yp/4z/vC3vSWdjUvEmCuM23c5BOBw+ MIIBCgKCAQEAuyfM+3od75zOYXqnqRMAt+yp/4z/vC3vSWdjUvEmCuM23c5BOBw+
dKqbWoSPTzOuaQ0szdL7a6YxT+poSUXd/i3pPz59KgCl192rd1pZoJKgvoluITev dKqbWoSPTzOuaQ0szdL7a6YxT+poSUXd/i3pPz59KgCl192rd1pZoJKgvoluITev
@ -71,7 +76,7 @@
nomic = { nomic = {
cores = 2; cores = 2;
dc = "tv"; #dc = "gg23"; dc = "tv"; #dc = "gg23";
nets = { nets = rec {
retiolum = { retiolum = {
addrs4 = ["10.243.0.110"]; addrs4 = ["10.243.0.110"];
addrs6 = ["42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec"]; addrs6 = ["42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec"];
@ -79,7 +84,7 @@
"nomic.retiolum" "nomic.retiolum"
"cgit.nomic.retiolum" "cgit.nomic.retiolum"
]; ];
tinc-key = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+ MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+
qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw
@ -95,15 +100,19 @@
rmdir = { rmdir = {
cores = 1; cores = 1;
dc = "tv"; #dc = "cac"; dc = "tv"; #dc = "cac";
nets = { nets = rec {
internet = {
addrs4 = ["167.88.44.94"];
};
retiolum = { retiolum = {
via = internet;
addrs4 = ["10.243.113.224"]; addrs4 = ["10.243.113.224"];
addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af5"]; addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af5"];
aliases = [ aliases = [
"rmdir.retiolum" "rmdir.retiolum"
"cgit.rmdir.retiolum" "cgit.rmdir.retiolum"
]; ];
tinc-key = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA+twy4obSbJdmZLfBoe9YYeyoDnXkO/WPa2D6Eh6jXrWk5fbhBjRf MIIBCgKCAQEA+twy4obSbJdmZLfBoe9YYeyoDnXkO/WPa2D6Eh6jXrWk5fbhBjRf
i3EAQfLiXXFJX3E8V8YvJyazXklI19jJtCLDiu/F5kgJJfyAkWHH+a/hcg7qllDM i3EAQfLiXXFJX3E8V8YvJyazXklI19jJtCLDiu/F5kgJJfyAkWHH+a/hcg7qllDM
@ -127,7 +136,7 @@
aliases = [ aliases = [
"wu.retiolum" "wu.retiolum"
]; ];
tinc-key = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEArDvU0cuBsVqTjCX2TlWL4XHSy4qSjUhjrDvUPZSKTVN7x6OENCUn MIIBCgKCAQEArDvU0cuBsVqTjCX2TlWL4XHSy4qSjUhjrDvUPZSKTVN7x6OENCUn
M27g9H7j4/Jw/8IHoJLiKnXHavOoc9UJM+P9Fla/4TTVADr69UDSnLgH+wGiHcEg M27g9H7j4/Jw/8IHoJLiKnXHavOoc9UJM+P9Fla/4TTVADr69UDSnLgH+wGiHcEg

23
4lib/tv/default.nix
View File

@ -76,6 +76,10 @@ builtins // lib // rec {
net = submodule ({ config, ... }: { net = submodule ({ config, ... }: {
options = { options = {
via = mkOption {
type = nullOr net;
default = null;
};
addrs = mkOption { addrs = mkOption {
type = listOf addr; type = listOf addr;
apply = _: config.addrs4 ++ config.addrs6; apply = _: config.addrs4 ++ config.addrs6;
@ -92,8 +96,23 @@ builtins // lib // rec {
# TODO nonEmptyListOf hostname # TODO nonEmptyListOf hostname
type = listOf hostname; type = listOf hostname;
}; };
tinc-key = mkOption { tinc = mkOption {
type = str; 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;
};
};
};
}; };
}; };
}); });