makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'uriel/master'

Browse source
This commit is contained in:
tv 2015-10-01 17:26:26 +02:00
parent 39d07cad03 e8a17e7e9c
commit 4af4fa89e5
10 changed files with 80 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
krebs/3modules/default.nix
View file

@ -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,42 @@ 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-----
'';
};
};
};
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-----
'';
};

2
krebs/Zhosts/cloudkrebs
View file

@ -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

14
krebs/Zhosts/echelon
View file

@ -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-----

13
lass/1systems/cloudkrebs.nix
View file

@ -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";
};
};
};

13
lass/1systems/echelon.nix
View file

@ -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";
};
};
};

14
lass/1systems/mors.nix
View file

@ -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";
};
};
};
@ -173,6 +174,7 @@
environment.systemPackages = with pkgs; [
cac
get
];
#TODO: fix this shit

12
lass/1systems/uriel.nix
View file

@ -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";
};
};
};

6
lass/2configs/base.nix
View file

@ -42,9 +42,11 @@ with lib;
enable = true;
search-domain = "retiolum";
exim-retiolum.enable = true;
build.deps.nixpkgs = {
build.source = {
git.nixpkgs = {
url = https://github.com/Lassulus/nixpkgs;
rev = "e74d0e7ff83c16846a81e1173543f180ad565076";
rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
};
};
};

1
lass/2configs/retiolum.nix
View file

@ -21,6 +21,7 @@
connectTo = [
"fastpoke"
"cloudkrebs"
"echelon"
"pigstarter"
"gum"
"flap"

1
lass/5pkgs/firefoxPlugins/result
View file

@ -1 +0,0 @@
/nix/store/gxr152p1bbgqcd839b0rckdd1h5cr886-vimperator