Merge remote-tracking branch 'uriel/master'
This commit is contained in:
commit
4af4fa89e5
|
@ -143,7 +143,7 @@ let
|
||||||
dc = "lass"; #dc = "cac";
|
dc = "lass"; #dc = "cac";
|
||||||
nets = rec {
|
nets = rec {
|
||||||
internet = {
|
internet = {
|
||||||
addrs4 = ["162.248.8.63"];
|
addrs4 = ["104.233.84.57"];
|
||||||
aliases = [
|
aliases = [
|
||||||
"echelon.internet"
|
"echelon.internet"
|
||||||
];
|
];
|
||||||
|
@ -158,12 +158,42 @@ let
|
||||||
];
|
];
|
||||||
tinc.pubkey = ''
|
tinc.pubkey = ''
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
MIIBCgKCAQEA92ybhDahtGybpAkUNlG5Elxw05MVY4Pg7yK0dQugB4nVq+pnmi78
|
MIIBCgKCAQEAuscWOYdHu0bpWacvwTNd6bcmrAQ0YFxJWHZF8kPZr+bMKIhnXLkJ
|
||||||
DOMeIciecMHmJM8n9UlUU0eWZVCgHeVd23d6J0hTHCv24p24uHEGGy7XlO/dPJ6A
|
oJheENIM6CA9lQQQFUxh2P2pxZavW5rgVlJxIKeiB+MB4v6ZO60LmZgpCsWGD/dX
|
||||||
IjROYU0l8c03pipdJ3cDBx6riArSglwmZJ7xH/Iw0BUhRZrPqbtijY7EcG2wc+8K
|
MipM2tLtQxYhvLJIJxEBWn3rxIgeEnCtZsH1KLWyLczb+QpvTjMJ4TNh1nEBPE/f
|
||||||
N9N9mBofVMl4EcBiDR/eecK+ro8OkeOmYPtYgFJLvxTYXiPIhOxMAlkOY2fpin/t
|
4LUH1JHaGhcaHl2dLemR9wnnDIjmSj0ENJp2al+hWnIggcA/Zp0e4b86Oqbbs5wA
|
||||||
cgFLUFuN4ag751XjjcNpVovVq95vdg+VhKrrNVWZjJt03owW81BzoryY6CD2kIPq
|
n++n5j971cTrBdA89nJDYOEtepisglScVRbgLqJG81lDA+n24RWFynn+U3oD/L8p
|
||||||
UxK89zEdeYOUT7AxaT/5V5v41IvGFZxCzwIDAQAB
|
do+kxlwZUEDRbPU4AO5L+UeIbimsuIfXiQIDAQAB
|
||||||
|
-----END RSA PUBLIC KEY-----
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
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-----
|
-----END RSA PUBLIC KEY-----
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
Address = 167.88.34.190
|
Address = 104.167.113.104
|
||||||
Subnet = 10.243.206.102
|
Subnet = 10.243.206.102
|
||||||
Subnet = 42:941e:2816:35f4:5c5e:206b:3f0b:f762
|
Subnet = 42:941e:2816:35f4:5c5e:206b:3f0b:f762
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
Address = 168.235.156.81
|
Address = 104.233.84.57
|
||||||
Subnet = 10.243.206.103
|
Subnet = 10.243.206.103
|
||||||
Subnet = 42:941e:2816:35f4:5c5e:206b:3f0b:f763
|
Subnet = 42:941e:2816:35f4:5c5e:206b:3f0b:f763
|
||||||
|
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
MIIBCgKCAQEA92ybhDahtGybpAkUNlG5Elxw05MVY4Pg7yK0dQugB4nVq+pnmi78
|
MIIBCgKCAQEAuscWOYdHu0bpWacvwTNd6bcmrAQ0YFxJWHZF8kPZr+bMKIhnXLkJ
|
||||||
DOMeIciecMHmJM8n9UlUU0eWZVCgHeVd23d6J0hTHCv24p24uHEGGy7XlO/dPJ6A
|
oJheENIM6CA9lQQQFUxh2P2pxZavW5rgVlJxIKeiB+MB4v6ZO60LmZgpCsWGD/dX
|
||||||
IjROYU0l8c03pipdJ3cDBx6riArSglwmZJ7xH/Iw0BUhRZrPqbtijY7EcG2wc+8K
|
MipM2tLtQxYhvLJIJxEBWn3rxIgeEnCtZsH1KLWyLczb+QpvTjMJ4TNh1nEBPE/f
|
||||||
N9N9mBofVMl4EcBiDR/eecK+ro8OkeOmYPtYgFJLvxTYXiPIhOxMAlkOY2fpin/t
|
4LUH1JHaGhcaHl2dLemR9wnnDIjmSj0ENJp2al+hWnIggcA/Zp0e4b86Oqbbs5wA
|
||||||
cgFLUFuN4ag751XjjcNpVovVq95vdg+VhKrrNVWZjJt03owW81BzoryY6CD2kIPq
|
n++n5j971cTrBdA89nJDYOEtepisglScVRbgLqJG81lDA+n24RWFynn+U3oD/L8p
|
||||||
UxK89zEdeYOUT7AxaT/5V5v41IvGFZxCzwIDAQAB
|
do+kxlwZUEDRbPU4AO5L+UeIbimsuIfXiQIDAQAB
|
||||||
-----END RSA PUBLIC KEY-----
|
-----END RSA PUBLIC KEY-----
|
||||||
|
|
|
@ -25,14 +25,15 @@
|
||||||
|
|
||||||
krebs.build = {
|
krebs.build = {
|
||||||
user = config.krebs.users.lass;
|
user = config.krebs.users.lass;
|
||||||
target = "root@cloudkrebs";
|
|
||||||
host = config.krebs.hosts.cloudkrebs;
|
host = config.krebs.hosts.cloudkrebs;
|
||||||
deps = {
|
source = {
|
||||||
secrets = {
|
dir.secrets = {
|
||||||
url = "/home/lass/secrets/${config.krebs.build.host.name}";
|
host = config.krebs.hosts.mors;
|
||||||
|
path = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||||
};
|
};
|
||||||
stockholm = {
|
dir.stockholm = {
|
||||||
url = toString ../..;
|
host = config.krebs.hosts.mors;
|
||||||
|
path = "/home/lass/dev/stockholm";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -28,14 +28,15 @@ in {
|
||||||
|
|
||||||
krebs.build = {
|
krebs.build = {
|
||||||
user = config.krebs.users.lass;
|
user = config.krebs.users.lass;
|
||||||
target = "root@${ip}";
|
|
||||||
host = config.krebs.hosts.echelon;
|
host = config.krebs.hosts.echelon;
|
||||||
deps = {
|
source = {
|
||||||
secrets = {
|
dir.secrets = {
|
||||||
url = "/home/lass/secrets/${config.krebs.build.host.name}";
|
host = config.krebs.hosts.mors;
|
||||||
|
path = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||||
};
|
};
|
||||||
stockholm = {
|
dir.stockholm = {
|
||||||
url = toString ../..;
|
host = config.krebs.hosts.mors;
|
||||||
|
path = "/home/lass/dev/stockholm";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -27,14 +27,15 @@
|
||||||
|
|
||||||
krebs.build = {
|
krebs.build = {
|
||||||
user = config.krebs.users.lass;
|
user = config.krebs.users.lass;
|
||||||
target = "root@mors";
|
|
||||||
host = config.krebs.hosts.mors;
|
host = config.krebs.hosts.mors;
|
||||||
deps = {
|
source = {
|
||||||
secrets = {
|
dir.secrets = {
|
||||||
url = "/home/lass/secrets/${config.krebs.build.host.name}";
|
host = config.krebs.hosts.mors;
|
||||||
|
path = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||||
};
|
};
|
||||||
stockholm = {
|
dir.stockholm = {
|
||||||
url = toString ../..;
|
host = config.krebs.hosts.mors;
|
||||||
|
path = "/home/lass/dev/stockholm";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -173,6 +174,7 @@
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
cac
|
cac
|
||||||
|
get
|
||||||
];
|
];
|
||||||
|
|
||||||
#TODO: fix this shit
|
#TODO: fix this shit
|
||||||
|
|
|
@ -27,12 +27,14 @@ with builtins;
|
||||||
user = config.krebs.users.lass;
|
user = config.krebs.users.lass;
|
||||||
target = "root@uriel";
|
target = "root@uriel";
|
||||||
host = config.krebs.hosts.uriel;
|
host = config.krebs.hosts.uriel;
|
||||||
deps = {
|
source = {
|
||||||
secrets = {
|
dir.secrets = {
|
||||||
url = "/home/lass/secrets/${config.krebs.build.host.name}";
|
host = config.krebs.hosts.mors;
|
||||||
|
path = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||||
};
|
};
|
||||||
stockholm = {
|
dir.stockholm = {
|
||||||
url = toString ../..;
|
host = config.krebs.hosts.mors;
|
||||||
|
path = "/home/lass/dev/stockholm";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -42,9 +42,11 @@ with lib;
|
||||||
enable = true;
|
enable = true;
|
||||||
search-domain = "retiolum";
|
search-domain = "retiolum";
|
||||||
exim-retiolum.enable = true;
|
exim-retiolum.enable = true;
|
||||||
build.deps.nixpkgs = {
|
build.source = {
|
||||||
url = https://github.com/Lassulus/nixpkgs;
|
git.nixpkgs = {
|
||||||
rev = "e74d0e7ff83c16846a81e1173543f180ad565076";
|
url = https://github.com/Lassulus/nixpkgs;
|
||||||
|
rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
connectTo = [
|
connectTo = [
|
||||||
"fastpoke"
|
"fastpoke"
|
||||||
"cloudkrebs"
|
"cloudkrebs"
|
||||||
|
"echelon"
|
||||||
"pigstarter"
|
"pigstarter"
|
||||||
"gum"
|
"gum"
|
||||||
"flap"
|
"flap"
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
/nix/store/gxr152p1bbgqcd839b0rckdd1h5cr886-vimperator
|
|
Loading…
Reference in New Issue
Block a user