From f2e0a1b466c6af1c5045e7fcacebe357429f6026 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 11 Apr 2017 19:59:25 +0200 Subject: l 1 prism: update JuiceSSH pubkey --- lass/1systems/prism.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/1systems') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index a7a7f6129..db073db80 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -157,7 +157,7 @@ in { } { users.users.chat.openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDiupmvj8gmiqIUTk9t4AOZ6bYvIpMMuNZULwIu/lbq8epK+FyvjRtCxqkLgFw0BfNYHzT9fxJ3kZY+nf/pnpI0j8TRwLAyPnfKuBfehrtzjdNbf1jCB9BQAaLoBHkLUFLJxskIC11nHx5KJVJvZBZZ6Odq1WIb4RZXjtEreQfvF8+YyFgHQ/epmQupKK6agHGkjtqvH+hz//dwDqHU9orj8MCWxNaa2wUgn+5laAvpLS15MQeCDIz8GJtJWToETY6bvldiLp2hIAJmgx8LIecV1h7YPR81Rk80gIk3f0PDfsLnnM6ibkI5p8NGh7nRKAdf+W90HpBIHKMRpRkMYvgL3ejVuKJZyzhYKUArA6egNRAN2d67eOpR/yKV5LjRxv+JBCOln5ynDbAmP4Hq98h+0K9Md7VavrRJzzPRTH3MPx+OKqsnRBRjhKsRFIUaO6/TBjZF4RCbbSSbvBW1u+qbTWX1MGUJNB5huL/OIBdHHcTb6GI3W4Svtgq4in2KI4COBhUJogm5UmaXRHtgqvn8byxutIsXMOTFjjdDK6r7mmOj1mzlu5wEHAV6FRsII92pf4WO2GYEUxz1ABu4HvRsVKlvYoEwwBhpXecTve6nogAiDvuxHjUX1eup3If3s4SvNirNPPUQuzNriYJ4JXiU6pGCJcBgxhl+NQ7ajxCdaw== JuiceSSH" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCkmIvB8BekIE2W24+I0gnzkvkEoeulz/zQkDUVJK4oScbIvgTYmcHzQuHJyPueTm67bJCOcYaTwEDNhcR/ZvcyiCQ7Jwa5cLDTkCkcR9LQq8ry5jMNEanvTgrnBIEcwfS7jFpyFb/PRVG6hh2bPOfP+ksFplkq1BTzKt/UTaCBwVEZqi5XuFIlq/MqJg+FIjh+wyeNR5jHtqgAhVjR+YLVNXLgtVPE+dlSfbyRQHuA9FTkUj8BxxnTdwM5Sx33S61ddik1XvRn++IYqFl68fZhzyTME7t/Mvjdz8J7ew2bF2IbJrXt37yQCAOEEp9/RC5OloA7dd/5ZJjZxSzT2HnYROILsYr3S0WV4e+H2G66ZN0ftdUCYh1o5rtY7IrSes6yHsKYbpoij1IAkRkyt2XgEH5EZCk1Omx8AY3ekW1KFIEhz2DZEfnCEjPf4AGCYZ0uy4XEztxzTDkh25TVs/tym1+96qCJ1yAxwWZDbVhS/Z6aSBpsyeDRKcak8qoWVC2dEPdYuTUmwvmo3pmGn/a4UfOLNJTn0jSRjy3kSv1hYzosN4NSYZqEylFB0ABnlqoLpX3tmWtrkiKv19S+djVGxbaaYm3hjPJfds3qCWTJWPvxPPeCE8wGXVLYqOQxa5ZPYeoTwRof5YNSbj5RFYy9sDLTlHl+U4ASTHZM5S3akQ== JuiceSSH" ]; } { -- cgit v1.3.1 From 4974fead67735f4405a05129066a8aaa53a7a2b6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 11 Apr 2017 21:40:42 +0200 Subject: l 1 prism: import paste.nix --- lass/1systems/prism.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index db073db80..e5cbacfc8 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -45,6 +45,7 @@ in { ../2configs/makefu-sip.nix ../2configs/monitoring/server.nix ../2configs/monitoring/monit-alarms.nix + ../2configs/paste.nix { imports = [ ../2configs/bepasty.nix -- cgit v1.3.1 From 9b44941911bccc46dafd82a2c427af3febbcbff8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Apr 2017 11:00:36 +0200 Subject: lass: .retiolum -> .r --- krebs/3modules/lass/default.nix | 35 +++++++++++------------------------ lass/1systems/mors.nix | 1 - lass/2configs/go.nix | 2 +- 3 files changed, 12 insertions(+), 26 deletions(-) (limited to 'lass/1systems') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 02aacb665..db0a7005f 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -19,7 +19,6 @@ with import ; 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 ; 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,10 @@ with import ; 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 = '' @@ -145,9 +140,8 @@ with import ; 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----- @@ -176,9 +170,8 @@ with import ; 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----- @@ -208,9 +201,7 @@ with import ; 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 = '' @@ -236,9 +227,8 @@ with import ; 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----- @@ -263,9 +253,8 @@ with import ; 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----- @@ -290,9 +279,7 @@ with import ; 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 = '' @@ -317,25 +304,25 @@ with import ; }; 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/lass/1systems/mors.nix b/lass/1systems/mors.nix index 534d65162..c196b391a 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -66,7 +66,6 @@ with import ; "localhost" "${config.krebs.build.host.name}" "${config.krebs.build.host.name}.r" - "${config.krebs.build.host.name}.retiolum" ]; locations."~ ^/~(.+?)(/.*)?\$".extraConfig = '' alias /home/$1/public_html$2; diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix index 8e31f050f..b75233871 100644 --- a/lass/2configs/go.nix +++ b/lass/2configs/go.nix @@ -17,7 +17,7 @@ with import ; ''; serverAliases = [ "go" - "go.retiolum" + "go.r" ]; }; }; -- cgit v1.3.1