summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/lass
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-12-01 11:21:09 +0100
committermakefu <github@syntax-fehler.de>2021-12-01 11:21:09 +0100
commit9301506249292633447910c4273573b82915d59c (patch)
tree099cc6a77a645fa98f41b0b5466a080c0b260894 /krebs/3modules/lass
parent13c525e54862f0989eea2e4606a68c98e6b49b79 (diff)
parentb79f5ab97db8115c4b2e66e57bb84587a31ce1e0 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/lass')
-rw-r--r--krebs/3modules/lass/default.nix23
-rw-r--r--krebs/3modules/lass/ssh/tablet.ed255191
2 files changed, 24 insertions, 0 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 1f118b8b0..280021347 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -71,6 +71,7 @@ in {
60 IN NS ns16.ovh.net.
60 IN NS dns16.ovh.net.
60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
+ 60 IN AAAA ${config.krebs.hosts.prism.nets.internet.ip6.addr}
IN MX 5 lassul.us.
60 IN TXT v=spf1 mx a:lassul.us -all
60 IN TXT ( "v=DKIM1; k=rsa; t=s; s=*; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUv3DMndFellqu208feABEzT/PskOfTSdJCOF/HELBR0PHnbBeRoeHEm9XAcOe/Mz2t/ysgZ6JFXeFxCtoM5fG20brUMRzsVRxb9Ur5cEvOYuuRrbChYcKa+fopu8pYrlrqXD3miHISoy6ErukIYCRpXWUJHi1TlNQhLWFYqAaywIDAQAB" )
@@ -98,6 +99,10 @@ in {
addr = "95.216.1.150";
prefix = "0.0.0.0/0";
};
+ ip6 = {
+ addr = "2a01:4f9:2a:1e9::1";
+ prefix = "2a01:4f9:2a:1e9::/64";
+ };
aliases = [
"prism.i"
"paste.i"
@@ -113,6 +118,7 @@ in {
"cache.prism.r"
"cgit.prism.r"
"flix.r"
+ "jelly.r"
"paste.r"
"c.r"
"p.r"
@@ -569,6 +575,20 @@ in {
ci = false;
syncthing.id = "PWKVXPB-JCNO6E4-KVIQ7CK-6FSOWHM-AWORMDU-HVVYLKW-44DQTYW-XZT7DQJ";
};
+ tablet = {
+ nets = {
+ wiregrill = {
+ ip4.addr = "10.244.1.14";
+ ip6.addr = w6 "b";
+ aliases = [
+ "tablet.w"
+ ];
+ wireguard.pubkey = "eIafsxYEFCqmWNFon6ZsYXeDrK4X1UJ9KD0zmNZjgEI=";
+ };
+ };
+ external = true;
+ ci = false;
+ };
hilum = {
cores = 1;
nets = {
@@ -817,5 +837,8 @@ in {
mail = "lassulus@gmail.com";
pubkey = builtins.readFile ./ssh/android.ed25519;
};
+ lass-tablet = {
+ pubkey = builtins.readFile ./ssh/tablet.ed25519;
+ };
};
}
diff --git a/krebs/3modules/lass/ssh/tablet.ed25519 b/krebs/3modules/lass/ssh/tablet.ed25519
new file mode 100644
index 000000000..250be53f7
--- /dev/null
+++ b/krebs/3modules/lass/ssh/tablet.ed25519
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICMaulRARjJt6gQ4q5DCj3ySAf4juHvVaIcXDRhWZ5mM u0_a234@localhost \ No newline at end of file