Merge remote-tracking branch 'lass/master'

5 files changed, 30 insertions, 5 deletions

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
         '';
-        };
+      };
     };
   };
 
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 6fe71e31b..d919c8129 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/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
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"