Merge remote-tracking branch 'orange/master'

5 files changed, 81 insertions, 0 deletions

diff --git a/kartei/Ra33it0/default.nix b/kartei/Ra33it0/default.nix
new file mode 100644
index 000000000..64e40182a
--- /dev/null
+++ b/kartei/Ra33it0/default.nix
@@ -0,0 +1,30 @@
+{ config, lib, ... }: let
+  slib = import ../../lib/pure.nix { inherit lib; };
+in {
+  users.Ra33it0 = {
+    mail = "Ra33it0@posteo.net";
+  };
+  hosts.DUMMYHOST = {
+    owner = config.krebs.users.Ra33it0;
+    nets.retiolum = {
+      aliases = [ "Ra33it0.Ra33it0.r" ];
+      ip6.addr = (slib.krebs.genipv6 "retiolum" "Ra33it0" { hostName = "unispore"; }).address;
+      tinc.pubkey = ''
+        -----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEA6Cb+b+snYpsQv1J0yMPSL4P0iKs2EkDtqtt6kBOvqFTr2lRB2thp
+mu9fRbz/CFmcvFXoEMWQEEkKcyhgJEola2+7Ra49iMNX55o/I0iZ499ZI5rIK/JG
++A60ijPCh5TSGYIMiD7VWRsxoAtzB1DZ6n4z94KN0wQB5dXKuLPjk/TDfJPuzMrS
+J5k9uSyBKcRdW2iop78wNOnYO8NVd9wr6odUBc/L5J0krDU2gLGRGJGDfoW4zfly
+5DwtY58DBCZS7uFAymKBdvEBUzj7/wD0B2Jfq/EUOdEKeFbP2G4fdOTQBuXGDqMi
+dqufCy2cK3AOi5l3VaC2LfkCMztRBPzryY8+EcfjgqENBPCx55GBZDrtn/W+29S7
+ynMfI+1e8TntpFGLhuJXyl9//rG68tvYUED5MQ98OXViiffW7lBo7i5TCck3f9Cv
+CWYM/HzSffzztK8bF0DwhdWzjtNcwZ05XfA2krGZyMj9UxpwN84o1syCnnYC1Xzg
+4r48fUhubXXE4SbdnN68pCNCct9DT8exPeYeJL2FHi6s+EsfBY+NGEAaQGJTeQEW
+zUSnX/txoZV6xGUKZ4iOgfQ4MBCVVdtPAaurNP/esVwOr0WF0DTuBDPGBaOqo+Us
+Ef5cREwrCE8nEY8tu3xl4M9iuCTwBuT79YFhfNI3jr1lcg6f8wGaTYsCAwEAAQ==
+        -----END RSA PUBLIC KEY-----
+      '';
+      tinc.pubkey_ed25519 = "cFCAfLbDYv/Ty3m34aHgHr1dXGp2DSwfP0K7GG1TA7D";
+    };
+  };
+}
diff --git a/kartei/berber/default.nix b/kartei/berber/default.nix
new file mode 100644
index 000000000..e4084054a
--- /dev/null
+++ b/kartei/berber/default.nix
@@ -0,0 +1,30 @@
+{ config, lib, ... }: let
+  slib = import ../../lib/pure.nix { inherit lib; };
+in {
+  users.berber = {
+    mail = "berber@zmberber.com";
+  };
+  hosts.schlepptop = {
+    owner = config.krebs.users.berber;
+    nets.retiolum = {
+      aliases = [ "schlepptop.berber.r" ];
+      ip6.addr = (slib.krebs.genipv6 "retiolum" "berber" { hostName = "schlepptop"; }).address;
+      tinc.pubkey = ''
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAsotvQWb0zgZzHQheM2LBMCyxYZ4JqWcpLkfz8nvLJl6wktEWz8IH
+7hkc9qjrvR0jLecO79PzFaF9n6h47OBMhJC2BzJJJys0iiOUcjWpMtLGUZTy2M83
+Wtfz8YuY0zMJmnt63cVFpEsorj2v99YmYxQww8IU1iSpxotNx1hED/3dEN44qqlL
+/aYRrnuFb/UOMxTcanpezJRqgqQpXBmlXYM0uE/uqUOWxHpWtQB5DsMf3s3YET/j
+N7yp8DStlAqRruWS52GtWqnqXTgRBjqcIdGvmSRP0ZsHEEXk7du7icAlo1ZdGDQ1
+BXo1LTeiKr7Ujb7f5Kz/aq0+xZsODXVjYwiS5ZuZvHO+YD0/eDD4YwQyCovJDNRS
+1GEkOBcE3acVn55ygg27PiRdm4FLbPoEL8t6CpgUCFVt1LTuuu/h++8WrbR4ggVp
+A8/5xmcUPd0DtWk9Uj++3ZW1PmPLnMtTFuUSkzLv1rdfCHgtQbTcTSEXByaizKlp
+CZdCSZjQnycBhPRW56ySWX3du38MNeAAlwGfXUjt4lOQsFiPs55MAedN9/JoTQCp
+2uJ+oy2I2zPWxt03e/3WW8eD0csTiSA4c/KRCtHKr9DCaT83Lmal52ztwmxzXhzU
+Aa8Zk+rzxj+e48Lab8COzOuqUyWYruxsFoM4BumEfmNOBrkXKCPjVokCAwEAAQ==
+-----END RSA PUBLIC KEY-----
+      '';
+      tinc.pubkey_ed25519 = "soXXSBhFM1/V7otecSzUIwTT4Zpn4DLyJ5B5p7Euz/B";
+    };
+  };
+}
diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix
index bbf6a74f8..6c5c86ead 100644
--- a/kartei/krebs/default.nix
+++ b/kartei/krebs/default.nix
@@ -77,6 +77,7 @@ in {
           aliases = [
             "hotdog.r"
             "agenda.r"
+            "bedge.r"
             "kri.r"
             "build.r"
             "build.hotdog.r"
diff --git a/kartei/lass/prism.nix b/kartei/lass/prism.nix
index 4e706083c..a44e120b2 100644
--- a/kartei/lass/prism.nix
+++ b/kartei/lass/prism.nix
@@ -37,6 +37,8 @@ rec {
       mail                60 IN A      ${nets.internet.ip4.addr}
       mail                60 IN AAAA   ${nets.internet.ip6.addr}
       flix                60 IN A      ${nets.internet.ip4.addr}
+      flex                60 IN A      ${nets.internet.ip4.addr}
+      flux                60 IN A      ${nets.internet.ip4.addr}
       testing             60 IN A      ${nets.internet.ip4.addr}
       schrott             60 IN A      ${nets.internet.ip4.addr}
     '';
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index bc5bfc0fb..db7b794f4 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -528,6 +528,24 @@ in {
     '';
   };
 
+  services.nginx.virtualHosts."bedge.r" = {
+    locations."/".extraConfig = ''
+      proxy_set_header Host $host;
+      proxy_pass http://localhost:${toString config.services.hledger-web.port};
+    '';
+    locations."/bedger.json".extraConfig = ''
+      proxy_set_header Host $host;
+      proxy_pass http://localhost:8011;
+    '';
+    extraConfig = ''
+      add_header 'Access-Control-Allow-Origin' '*';
+      add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+    '';
+  };
+  services.hledger-web = {
+    enable = true;
+  };
+
   systemd.services.reaktor2-r.serviceConfig.DynamicUser = mkForce false;
   systemd.services.reaktor2-hackint.serviceConfig.DynamicUser = mkForce false;
   krebs.reaktor2 = {