From 8f97f5e2e1fd5c6f73db0bc6546ad098c8b162fe Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 21 Nov 2021 20:39:28 +0100 Subject: krebs zone-head-config: fix style --- krebs/3modules/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 24b17487b..7b6639212 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -80,9 +80,9 @@ let description = '' The zone configuration head which is being used to create the zone files. The string for each key is pre-pended to the zone file. - ''; - # TODO: configure the default somewhere else, - # maybe use krebs.dns.providers + ''; + # TODO: configure the default somewhere else, + # maybe use krebs.dns.providers default = { # github.io -> 192.30.252.154 @@ -96,7 +96,7 @@ let IN A 185.199.110.153 IN A 185.199.111.153 ''; - }; + }; }; }; -- cgit v1.2.3 From ee59532c6067394eb4c509aca7f3bef0175b8668 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 27 Nov 2021 23:45:26 +0100 Subject: l prism.r: add internet ipv6 address --- krebs/3modules/lass/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'krebs/3modules') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 1f118b8b0..7b09ef07b 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" -- cgit v1.2.3 From d71fe62fffe25f20fd5534fe22c7bd414b9f98db Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 27 Nov 2021 23:47:15 +0100 Subject: l prism.r: add jelly.r alias + proxy_pass --- krebs/3modules/lass/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 7b09ef07b..dfe7c5015 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -118,6 +118,7 @@ in { "cache.prism.r" "cgit.prism.r" "flix.r" + "jelly.r" "paste.r" "c.r" "p.r" -- cgit v1.2.3 From 8a0685d85940eb1f2e2cf595730b02cc73b0219e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 27 Nov 2021 23:48:41 +0100 Subject: l: init tablet.r --- krebs/3modules/lass/default.nix | 17 +++++++++++++++++ krebs/3modules/lass/ssh/tablet.ed25519 | 1 + 2 files changed, 18 insertions(+) create mode 100644 krebs/3modules/lass/ssh/tablet.ed25519 (limited to 'krebs/3modules') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index dfe7c5015..280021347 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -575,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 = { @@ -823,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 -- cgit v1.2.3 From 948584f291627d35d6da2f41704fd19adc4dbdde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 30 Nov 2021 22:00:34 +0100 Subject: external: kmein takes over graph.r --- krebs/3modules/external/default.nix | 1 + krebs/3modules/makefu/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 28d58b525..7c896e90a 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -151,6 +151,7 @@ in { "makanek.kmein.r" "grafana.kmein.r" "names.kmein.r" + "graph.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 03431ce5f..7780863a3 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -221,7 +221,7 @@ in { "cgit.gum.r" "dcpp.gum.r" "dcpp.nextgum.r" - "graph.r" + "graph.makefu.r" "logs.makefu.r" "netdata.makefu.r" "nextgum.r" -- cgit v1.2.3