1 files changed, 5 insertions, 16 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index b05e774b..3e58fee1 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -55,7 +55,6 @@ in {
             '';
             pubkey_ed25519 = "P+bhzhgTNdohWdec//t/e+8cI7zUOsS+Kq/AOtineAO";
           };
-          tinc.port = 655;
         };
       };
       ssh.privkey.path = <secrets/ssh.id_ed25519>;
@@ -78,7 +77,7 @@ in {
                               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.
+                                 IN MX     5 mail.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" )
           default._domainkey  60 IN TXT    "k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUv3DMndFellqu208feABEzT/PskOfTSdJCOF/HELBR0PHnbBeRoeHEm9XAcOe/Mz2t/ysgZ6JFXeFxCtoM5fG20brUMRzsVRxb9Ur5cEvOYuuRrbChYcKa+fopu8pYrlrqXD3miHISoy6ErukIYCRpXWUJHi1TlNQhLWFYqAaywIDAQAB"
@@ -97,6 +96,9 @@ in {
           streaming           60 IN A      ${config.krebs.hosts.prism.nets.internet.ip4.addr}
           mumble              60 IN A      ${config.krebs.hosts.prism.nets.internet.ip4.addr}
           mail                60 IN A      ${config.krebs.hosts.prism.nets.internet.ip4.addr}
+          flix                60 IN A      ${config.krebs.hosts.prism.nets.internet.ip4.addr}
+          confusion           60 IN A      ${config.krebs.hosts.prism.nets.internet.ip4.addr}
+          testing             60 IN A      ${config.krebs.hosts.prism.nets.internet.ip4.addr}
         '';
       };
       nets = rec {
@@ -123,6 +125,7 @@ in {
             "prism.r"
             "cache.prism.r"
             "cgit.prism.r"
+            "bota.r"
             "flix.r"
             "jelly.r"
             "paste.r"
@@ -131,7 +134,6 @@ in {
             "search.r"
             "radio-news.r"
           ];
-          tinc.port = 655;
           tinc = {
             pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----
@@ -192,7 +194,6 @@ in {
           aliases = [
             "mors.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----
@@ -229,7 +230,6 @@ in {
           aliases = [
             "shodan.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----
@@ -267,7 +267,6 @@ in {
           aliases = [
             "icarus.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----
@@ -304,7 +303,6 @@ in {
           aliases = [
             "daedalus.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----
@@ -339,7 +337,6 @@ in {
           aliases = [
             "skynet.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----
@@ -376,7 +373,6 @@ in {
           aliases = [
             "littleT.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----
@@ -429,7 +425,6 @@ in {
           aliases = [
             "xerxes.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----
@@ -482,7 +477,6 @@ in {
           aliases = [
             "yellow.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN PUBLIC KEY-----
@@ -523,7 +517,6 @@ in {
           aliases = [
             "blue.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN PUBLIC KEY-----
@@ -566,7 +559,6 @@ in {
           aliases = [
             "green.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN PUBLIC KEY-----
@@ -638,7 +630,6 @@ in {
           aliases = [
             "hilum.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN PUBLIC KEY-----
@@ -682,7 +673,6 @@ in {
           aliases = [
             "styx.r"
           ];
-          tinc.port = 654;
           tinc = {
             pubkey = ''
               -----BEGIN PUBLIC KEY-----
@@ -727,7 +717,6 @@ in {
           aliases = [
             "coaxmetal.r"
           ];
-          tinc.port = 0;
           tinc = {
             pubkey = ''
               -----BEGIN PUBLIC KEY-----