From b6383dba83a2e9ec6ada40fb780c15a56c8d715e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 27 Sep 2015 20:04:28 +0200 Subject: [PATCH 1/9] lass 2 base: bump nixpkgs rev --- lass/2configs/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 7c4835461..6cdeab1b9 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -44,7 +44,7 @@ with lib; exim-retiolum.enable = true; build.deps.nixpkgs = { url = https://github.com/Lassulus/nixpkgs; - rev = "e74d0e7ff83c16846a81e1173543f180ad565076"; + rev = "68bd8e4a9dc247726ae89cc8739574261718e328"; }; }; From a6812b4440e095287b6f2228a78b65c7629866de Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 11:55:39 +0200 Subject: [PATCH 2/9] lass: make compatible with new krebs.build --- lass/1systems/cloudkrebs.nix | 13 +++++++------ lass/1systems/echelon.nix | 13 +++++++------ lass/1systems/mors.nix | 13 +++++++------ lass/1systems/uriel.nix | 12 +++++++----- lass/2configs/base.nix | 8 +++++--- 5 files changed, 33 insertions(+), 26 deletions(-) diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix index 7c95e0f87..5235c25e5 100644 --- a/lass/1systems/cloudkrebs.nix +++ b/lass/1systems/cloudkrebs.nix @@ -25,14 +25,15 @@ krebs.build = { user = config.krebs.users.lass; - target = "root@cloudkrebs"; host = config.krebs.hosts.cloudkrebs; - deps = { - secrets = { - url = "/home/lass/secrets/${config.krebs.build.host.name}"; + source = { + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; }; - stockholm = { - url = toString ../..; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/dev/stockholm"; }; }; }; diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index 92976366f..d1a3f34f7 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -28,14 +28,15 @@ in { krebs.build = { user = config.krebs.users.lass; - target = "root@${ip}"; host = config.krebs.hosts.echelon; - deps = { - secrets = { - url = "/home/lass/secrets/${config.krebs.build.host.name}"; + source = { + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; }; - stockholm = { - url = toString ../..; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/dev/stockholm"; }; }; }; diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index de5e824c4..9d234f14b 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -27,14 +27,15 @@ krebs.build = { user = config.krebs.users.lass; - target = "root@mors"; host = config.krebs.hosts.mors; - deps = { - secrets = { - url = "/home/lass/secrets/${config.krebs.build.host.name}"; + source = { + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; }; - stockholm = { - url = toString ../..; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/dev/stockholm"; }; }; }; diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index bb98975e4..9d96e7814 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -27,12 +27,14 @@ with builtins; user = config.krebs.users.lass; target = "root@uriel"; host = config.krebs.hosts.uriel; - deps = { - secrets = { - url = "/home/lass/secrets/${config.krebs.build.host.name}"; + source = { + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; }; - stockholm = { - url = toString ../..; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/dev/stockholm"; }; }; }; diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 6cdeab1b9..46435649b 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -42,9 +42,11 @@ with lib; enable = true; search-domain = "retiolum"; exim-retiolum.enable = true; - build.deps.nixpkgs = { - url = https://github.com/Lassulus/nixpkgs; - rev = "68bd8e4a9dc247726ae89cc8739574261718e328"; + build.source = { + git.nixpkgs = { + url = https://github.com/Lassulus/nixpkgs; + rev = "68bd8e4a9dc247726ae89cc8739574261718e328"; + }; }; }; From 611ff367cf3d057e78ed3112416073b1f48c6aef Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 11:56:01 +0200 Subject: [PATCH 3/9] lass 2 base: add get to pkgs --- lass/2configs/base.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 46435649b..948b54d8d 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -75,6 +75,8 @@ with lib; most rxvt_unicode.terminfo + get + #network iptables ]; From 0f2f56097b4a404a1b0b0e52f948bba878c05caa Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 11:56:13 +0200 Subject: [PATCH 4/9] krebs 3: add fastpoke --- krebs/3modules/default.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index f0eb290ca..6f7b5c7b9 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -169,6 +169,36 @@ let }; }; }; + fastpoke = { + dc = "lass"; #dc = "cac"; + nets = rec { + internet = { + addrs4 = ["193.22.164.36"]; + aliases = [ + "fastpoke.internet" + ]; + }; + retiolum = { + via = internet; + addrs4 = ["10.243.253.152"]; + addrs6 = ["42:422a:194f:ff3b:e196:2f82:5cf5:bc00"]; + aliases = [ + "fastpoke.retiolum" + "cgit.fastpoke.retiolum" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAs4p5xsQYx06v+OkUbc09K6voFAbkvO66QdFoM71E10XyCeLP6iuq + DaIOFN4GrPR36pgyjqtJ+62G9uR+WsB/y14eio1p1ivDWgcpt5soOZAH5zVRRD9O + FBDlgVNwIJ6stMHy6OenEKWsfEiZRN3XstnqAqyykzjddglth1tJntn6kbZehzNQ + ezfIyN4XgaX2fhSu+UnAyLcV8wWnF9cMABjz7eKcSmRJgtG4ZiuDkbgiiEew7+pB + EPqOVQ80lJvzQKgO4PmVoAjD9A+AHnmLJNPDQQi8nIVilGCT60IX+XT1rt85Zpdy + rEaeriw/qsVJnberAhDAdQYYuM1ai2H5swIDAQAB + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; cloudkrebs = { cores = 1; dc = "lass"; #dc = "cac"; From 4d8408aa5a119d9d99c94950d829ab99fab748dc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 15:18:31 +0200 Subject: [PATCH 5/9] lass: install get only on mors --- lass/1systems/mors.nix | 1 + lass/2configs/base.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 9d234f14b..b7291a8f2 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -174,6 +174,7 @@ environment.systemPackages = with pkgs; [ cac + get ]; #TODO: fix this shit diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 948b54d8d..46435649b 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -75,8 +75,6 @@ with lib; most rxvt_unicode.terminfo - get - #network iptables ]; From 4c2b5f628d59580e84dbe64124150effd4bf539f Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 15:18:58 +0200 Subject: [PATCH 6/9] krebs Zhosts: bump cloudkrebs Address --- krebs/Zhosts/cloudkrebs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/Zhosts/cloudkrebs b/krebs/Zhosts/cloudkrebs index ed46a36bd..3886371ff 100644 --- a/krebs/Zhosts/cloudkrebs +++ b/krebs/Zhosts/cloudkrebs @@ -1,4 +1,4 @@ -Address = 167.88.34.190 +Address = 104.167.113.104 Subnet = 10.243.206.102 Subnet = 42:941e:2816:35f4:5c5e:206b:3f0b:f762 From ceb8226bc453244f8740137b58707b8e32a28c76 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 15:19:31 +0200 Subject: [PATCH 7/9] krebs: new key for echelon --- krebs/3modules/default.nix | 14 +++++++------- krebs/Zhosts/echelon | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 6f7b5c7b9..a0603cd8c 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -143,7 +143,7 @@ let dc = "lass"; #dc = "cac"; nets = rec { internet = { - addrs4 = ["162.248.8.63"]; + addrs4 = ["104.233.84.57"]; aliases = [ "echelon.internet" ]; @@ -158,12 +158,12 @@ let ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEA92ybhDahtGybpAkUNlG5Elxw05MVY4Pg7yK0dQugB4nVq+pnmi78 - DOMeIciecMHmJM8n9UlUU0eWZVCgHeVd23d6J0hTHCv24p24uHEGGy7XlO/dPJ6A - IjROYU0l8c03pipdJ3cDBx6riArSglwmZJ7xH/Iw0BUhRZrPqbtijY7EcG2wc+8K - N9N9mBofVMl4EcBiDR/eecK+ro8OkeOmYPtYgFJLvxTYXiPIhOxMAlkOY2fpin/t - cgFLUFuN4ag751XjjcNpVovVq95vdg+VhKrrNVWZjJt03owW81BzoryY6CD2kIPq - UxK89zEdeYOUT7AxaT/5V5v41IvGFZxCzwIDAQAB + MIIBCgKCAQEAuscWOYdHu0bpWacvwTNd6bcmrAQ0YFxJWHZF8kPZr+bMKIhnXLkJ + oJheENIM6CA9lQQQFUxh2P2pxZavW5rgVlJxIKeiB+MB4v6ZO60LmZgpCsWGD/dX + MipM2tLtQxYhvLJIJxEBWn3rxIgeEnCtZsH1KLWyLczb+QpvTjMJ4TNh1nEBPE/f + 4LUH1JHaGhcaHl2dLemR9wnnDIjmSj0ENJp2al+hWnIggcA/Zp0e4b86Oqbbs5wA + n++n5j971cTrBdA89nJDYOEtepisglScVRbgLqJG81lDA+n24RWFynn+U3oD/L8p + do+kxlwZUEDRbPU4AO5L+UeIbimsuIfXiQIDAQAB -----END RSA PUBLIC KEY----- ''; }; diff --git a/krebs/Zhosts/echelon b/krebs/Zhosts/echelon index 9d1c324fd..de4366875 100644 --- a/krebs/Zhosts/echelon +++ b/krebs/Zhosts/echelon @@ -1,12 +1,12 @@ -Address = 168.235.156.81 +Address = 104.233.84.57 Subnet = 10.243.206.103 Subnet = 42:941e:2816:35f4:5c5e:206b:3f0b:f763 -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA92ybhDahtGybpAkUNlG5Elxw05MVY4Pg7yK0dQugB4nVq+pnmi78 -DOMeIciecMHmJM8n9UlUU0eWZVCgHeVd23d6J0hTHCv24p24uHEGGy7XlO/dPJ6A -IjROYU0l8c03pipdJ3cDBx6riArSglwmZJ7xH/Iw0BUhRZrPqbtijY7EcG2wc+8K -N9N9mBofVMl4EcBiDR/eecK+ro8OkeOmYPtYgFJLvxTYXiPIhOxMAlkOY2fpin/t -cgFLUFuN4ag751XjjcNpVovVq95vdg+VhKrrNVWZjJt03owW81BzoryY6CD2kIPq -UxK89zEdeYOUT7AxaT/5V5v41IvGFZxCzwIDAQAB +MIIBCgKCAQEAuscWOYdHu0bpWacvwTNd6bcmrAQ0YFxJWHZF8kPZr+bMKIhnXLkJ +oJheENIM6CA9lQQQFUxh2P2pxZavW5rgVlJxIKeiB+MB4v6ZO60LmZgpCsWGD/dX +MipM2tLtQxYhvLJIJxEBWn3rxIgeEnCtZsH1KLWyLczb+QpvTjMJ4TNh1nEBPE/f +4LUH1JHaGhcaHl2dLemR9wnnDIjmSj0ENJp2al+hWnIggcA/Zp0e4b86Oqbbs5wA +n++n5j971cTrBdA89nJDYOEtepisglScVRbgLqJG81lDA+n24RWFynn+U3oD/L8p +do+kxlwZUEDRbPU4AO5L+UeIbimsuIfXiQIDAQAB -----END RSA PUBLIC KEY----- From a34de6743a44760d21589d4e1a154ccc5c621420 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 15:20:13 +0200 Subject: [PATCH 8/9] lass 2 retiolum: connect to echelon --- lass/2configs/retiolum.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix index 17cd1d822..d7df15027 100644 --- a/lass/2configs/retiolum.nix +++ b/lass/2configs/retiolum.nix @@ -21,6 +21,7 @@ connectTo = [ "fastpoke" "cloudkrebs" + "echelon" "pigstarter" "gum" "flap" From e8a17e7e9c471108d4f552c8cb668a97df75a382 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 1 Oct 2015 17:24:54 +0200 Subject: [PATCH 9/9] lass 5 firefoxPlugins: remove broken link --- lass/5pkgs/firefoxPlugins/result | 1 - 1 file changed, 1 deletion(-) delete mode 120000 lass/5pkgs/firefoxPlugins/result diff --git a/lass/5pkgs/firefoxPlugins/result b/lass/5pkgs/firefoxPlugins/result deleted file mode 120000 index aa5334414..000000000 --- a/lass/5pkgs/firefoxPlugins/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/gxr152p1bbgqcd839b0rckdd1h5cr886-vimperator \ No newline at end of file