summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/lass
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/3modules/lass')
-rw-r--r--krebs/3modules/lass/default.nix36
-rw-r--r--krebs/3modules/lass/ssh/shodan.rsa2
2 files changed, 13 insertions, 25 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 6ab8ede56..db0a7005f 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -19,7 +19,6 @@ with import <stockholm/lib>;
ip4.addr = "10.243.133.99";
ip6.addr = "42:0000:0000:0000:0000:0000:d15f:1233";
aliases = [
- "dishfire.retiolum"
"dishfire.r"
];
tinc.pubkey = ''
@@ -52,10 +51,8 @@ with import <stockholm/lib>;
ip4.addr = "10.243.206.103";
ip6.addr = "42:941e:2816:35f4:5c5e:206b:3f0b:f763";
aliases = [
- "echelon.retiolum"
"echelon.r"
- "cgit.echelon.retiolum"
- "go.retiolum"
+ "cgit.echelon.r"
"go.r"
];
tinc.pubkey = ''
@@ -96,12 +93,11 @@ with import <stockholm/lib>;
ip4.addr = "10.243.0.103";
ip6.addr = "42:0000:0000:0000:0000:0000:0000:15ab";
aliases = [
- "prism.retiolum"
"prism.r"
- "cgit.prism.retiolum"
"cgit.prism.r"
"cache.prism.r"
- "paste.r" "paste.retiolum"
+ "paste.r"
+ "p.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
@@ -144,9 +140,8 @@ with import <stockholm/lib>;
ip4.addr = "10.243.206.102";
ip6.addr = "42:941e:2816:35f4:5c5e:206b:3f0b:f762";
aliases = [
- "cloudkrebs.retiolum"
"cloudkrebs.r"
- "cgit.cloudkrebs.retiolum"
+ "cgit.cloudkrebs.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
@@ -175,9 +170,8 @@ with import <stockholm/lib>;
ip4.addr = "10.243.81.176";
ip6.addr = "42:dc25:60cf:94ef:759b:d2b6:98a9:2e56";
aliases = [
- "uriel.retiolum"
"uriel.r"
- "cgit.uriel.retiolum"
+ "cgit.uriel.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
@@ -207,9 +201,7 @@ with import <stockholm/lib>;
ip4.addr = "10.243.0.2";
ip6.addr = "42:0:0:0:0:0:0:dea7";
aliases = [
- "mors.retiolum"
"mors.r"
- "cgit.mors.retiolum"
"cgit.mors.r"
];
tinc.pubkey = ''
@@ -235,9 +227,8 @@ with import <stockholm/lib>;
ip4.addr = "10.243.0.3";
ip6.addr = "42:0:0:0:0:0:0:7105";
aliases = [
- "helios.retiolum"
"helios.r"
- "cgit.helios.retiolum"
+ "cgit.helios.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
@@ -262,9 +253,8 @@ with import <stockholm/lib>;
ip4.addr = "10.243.0.4";
ip6.addr = "42:0:0:0:0:0:0:50d4";
aliases = [
- "shodan.retiolum"
"shodan.r"
- "cgit.shodan.retiolum"
+ "cgit.shodan.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
@@ -289,9 +279,7 @@ with import <stockholm/lib>;
ip4.addr = "10.243.133.114";
ip6.addr = "42:0000:0000:0000:0000:0000:d15f:1214";
aliases = [
- "icarus.retiolum"
"icarus.r"
- "cgit.icarus.retiolum"
"cgit.icarus.r"
];
tinc.pubkey = ''
@@ -316,25 +304,25 @@ with import <stockholm/lib>;
};
users = {
lass = {
- mail = "lass@mors.retiolum";
+ mail = "lass@mors.r";
pubkey = builtins.readFile ./ssh/mors.rsa;
pgp.pubkeys.default = builtins.readFile ./pgp/mors.pgp;
};
lass-uriel = {
- mail = "lass@uriel.retiolum";
+ mail = "lass@uriel.r";
pubkey = builtins.readFile ./ssh/uriel.rsa;
};
lass-helios = {
- mail = "lass@helios.retiolum";
+ mail = "lass@helios.r";
pubkey = builtins.readFile ./ssh/helios.rsa;
};
lass-shodan = {
- mail = "lass@shodan.retiolum";
+ mail = "lass@shodan.r";
pubkey = builtins.readFile ./ssh/shodan.rsa;
pgp.pubkeys.default = builtins.readFile ./pgp/shodan.pgp;
};
lass-icarus = {
- mail = "lass@icarus.retiolum";
+ mail = "lass@icarus.r";
pubkey = builtins.readFile ./ssh/icarus.rsa;
};
fritz = {
diff --git a/krebs/3modules/lass/ssh/shodan.rsa b/krebs/3modules/lass/ssh/shodan.rsa
index 3ee08ad41..36a8901fa 100644
--- a/krebs/3modules/lass/ssh/shodan.rsa
+++ b/krebs/3modules/lass/ssh/shodan.rsa
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDV+EscrUKgsu6iO94lJQ45o0t9QV88H7RrbLCsysgesQqiCbq0XNJKSrKI4T/o5dBNfoHMi4FSuPsF3YzffvMOWmdluHRBIhDJSDiFaraHr1zu7fHDO8gsUf/a3H3LPHtRRoXQFNsIK5NRLR35WpKt+zG6GK/WLBzb2N4MR3Ym5Qo2OepW3pgMWjjbmiUbGGiao9OWgx5tjjT8PLHIWdoEmJsaE5UnOWebqY+xfkWXMLdzMBPyEdCVwUO7X3Ip0Zk/BJFSqtIHBqQtp+njgeRwfkL2xabge3VGALAnQg5iYXzT8kfzIu/wfaoSdGkdPWxMo80KDiJJlpLj1oC3ABmDj01Hgu9p+g5Em0SFevcenspTii3IvYqdq+eg5+pPny4ki9748t6FlWRsrjrmjdQVVMWbhx42+lsyxIYsdXhwWMqNwTNzvY7Fxy3/8XE14pYWCV5eEll2/hSNfI6AcOoJ0vfHvOXsY6GVMYklXDIFzmiJOpyox+DnTahyUqQ6IcLH73vp9boVK31kf8EC7VDp8ms2ZiXz9nfPYltiUOtKKG0gqg9Jgs7xthpX82WYEp2+PXzPCHWs4WXs3OsUzQ8ykXXD2A7JMVBBv0FaMD4aBsOe7hU20/sO+/J/uuPe5xnpI//uFK4KkYCmDHZcZ3Qzh9CQTISwFvOBbYtRWbDo5w== lass@shodan
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDH31q4qmu8dbnu5BJMEW5CAMW9xlZg5dNTREy6vHE5OofmDEzi5YTBYr543ppGYQL/PzepChGl8RKZETeU+pnqTTHgnUh3KkOnX0GmpKgDgFgDrdVwyU137P6RyOo/kLvfbzAu1bFC5Q5hUDdbd5dDAQGN23wsRQxx1EI1uMrrMbMUKxpk/x5+AZi0JfAOY4SJNYIRfnim5v9jAt1JHeOjKy3sT3/ZEaJqK8DAKEHo0/kYyizWn5M7do5bw2+WpG/gHpdtTD0NlKwFUyMzhFJh4ahDt9FtExnmDA45rAcVSsinhUmrPqPwBKEnUxle5tw3A4YRHUvqhHTo6G852iiPHE0DUlCKsDJwr+lw3DXjK+HYOdKMFC6nsh4x+SFrwg6JKCXPzeCH2w7VP5xJGlb3YS+NcvbYWRbiqJ/M2hVdn/Atxq2VUAdKnrNtNW4ZYH6yJTGOkcXkyKJzcTj5JZIvJd1DL0pI9aGWNxnmfyOVMgaKfdafBqU/PB8RPPAZH9RCVRH0g+Cnu0NoJmkwKaq0K+z+FF9eNqVpNnYnjVLsPvjLIXCn8kJl4/2mimDlOarj/I9Hs+k0/gbzx4PKUS87+rUVA4Hfz+MltzZQUGoIBQxciAgVVh7zLrMgnPWwvqHnMKAQ9nzgme3A4ew2Ocyl30+skLstr9e08VqErguYSw== lass@shodan