littlelink-m3tm3re + traefik env fix

hosts/lkk-nix-1/default.nix

@@ -38,13 +38,8 @@
         owner = "n8n";
       };
 
-      godaddy-api-key = {
-        file = ../../secrets/godaddy-api-key.age;
-        mode = "770";
-        owner = "traefik";
-      };
-      godaddy-api-secret = {
-        file = ../../secrets/godaddy-api-secret.age;
+      traefik-env = {
+        file = ../../secrets/traefik-env.age;
         mode = "770";
         owner = "traefik";
       };
@@ -61,6 +56,10 @@
         file = ../../secrets/briefkasten-env.age;
         mode = "770";
       };
+      littlelink-lanakk-env = {
+        file = ../../secrets/littlelink-lanakk-env.age;
+        mode = "770";
+      };
     };
     identityPaths = [ "/home/m3tam3re/.ssh/lkk-nix-1" ];
   };

hosts/lkk-nix-1/services/containers/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./baserow.nix
     ./briefkasten.nix
+    ./little-link.nix
     ./matomo.nix
     ./nextcloud.nix
     ./wordpress.nix

hosts/lkk-nix-1/services/containers/little-link.nix

@@ -0,0 +1,14 @@
+{ config, outputs, ... }: {
+  virtualisation.oci-containers.containers."littlelink_lanakk" = {
+    image = "ghcr.io/techno-tim/littlelink-server";
+    environmentFiles = [ config.age.secrets.littlelink-lanakk-env.path ];    
+    ports = [ "3010:3000" ];
+    extraOptions = [ "--ip=10.88.0.20" ];
+  };
+  virtualisation.oci-containers.containers."littlelink_m3tam3re" = {
+    image = "ghcr.io/techno-tim/littlelink-server";
+    environmentFiles = [ config.age.secrets.littlelink-lanakk-env.path ];    
+    ports = [ "3011:3000" ];
+    extraOptions = [ "--ip=10.88.0.21" ];
+  };
+}

hosts/lkk-nix-1/services/traefik.nix

@@ -57,6 +57,10 @@
           adguard.loadBalancer.servers = [{ url = "http://localhost:3008/"; }];
           briefkasten.loadBalancer.servers =
             [{ url = "http://localhost:3009/"; }];
+          littlelink-lanakk.loadBalancer.servers =
+            [{ url = "http://localhost:3010/"; }];
+          littlelink-m3tam3re.loadBalancer.servers =
+            [{ url = "http://localhost:3011/"; }];
         };
         routers = {
           api = {
@@ -165,19 +169,27 @@
             service = "briefkasten";
             entrypoints = "websecure";
           };
+          littlelink-lanakk = {
+            rule = "Host(`links.lanakk.com`)";
+            tls = {
+              certResolver = "godaddy";
+              domains = "links.lanakk.com";
+            };
+            service = "littlelink-lanakk";
+            entrypoints = "websecure";
+          };
+          littlelink-m3tm3re = {
+            rule = "Host(`links.m3tam3re.com`)";
+            tls = { domains = "links.m3tam3re.com"; };
+            service = "littlelink-m3tam3re";
+            entrypoints = "websecure";
+          };
         };
       };
     };
   };
 
-  systemd.services.traefik.environment = {
-    GODADDY_API_KEY_FILE = config.age.secrets.godaddy-api-key.path;
-    GODADDY_API_SECRET_FILE = config.age.secrets.godaddy-api-secret.path;
-  }; # TODO put all the variables into an env file
-  systemd.services.traefik.postStart = ''
-
-    /run/current-system/sw/bin/bash -c GODADDY_API_KEY=`cat $GODADDY_API_KEY_FILE` && export GODADDY_API_KEY
-
-    /run/current-system/sw/bin/bash -c GODADDY_API_SECRET=`cat $GODADDY_API_SECRET_FILE` && export GODADDY_API_SECRET
-  '';
+  systemd.services.traefik.serviceConfig = {
+    EnvironmentFile="${config.age.secrets.traefik-env.path}";
+  };
 }

secrets.nix

@@ -14,4 +14,8 @@ in {
   "wg-easy-environmentFile.age".publicKeys = [ root ];
   
   "briefkasten-env.age".publicKeys = [ root ];
+
+  "littlelink-lanakk-env.age".publicKeys = [ root ];
+
+  "traefik-env.age".publicKeys = [ root ];
 }

secrets/godaddy-api-key.age

@@ -1,16 +0,0 @@
-age-encryption.org/v1
--> ssh-rsa DQlE7w
-qGTWBFuZm/sDdGs+eE6L7RWjb5FtITdX8SI6TmkR03wtT8tQVNNOx/QGZGSXdaiU
-IXSFIuV0Scp6xa8WMNusY3/7IhNGjVqLkC6Fq7UpmsRtCHMlATGs4vYVDkQ2wg/W
-Zh2e6IOKJi4X1eTHNmVsrBueAVtwr3tZYG2aDMedse6YA2qaEfbfWIOVfbQABVhU
-0DyCcws5Crf2ziLc2dGLR5PO89zhHPubwiBEtPLqFF8n+E9kSOQE+mcLzaTBIlRI
-qoamyrIdzTtt8ucP2o32mc33gPR5c7X4orzCetgSXTU3N/AsQmUUV/Y0pUChR+FJ
-ZfrXi6UY+b8JM68a53QXMaMntMZgR4rg6gKjP7idSoL3X8dHKWGADXTDpeqFjgPR
-gdN6TfGKQShcYVFpmtcjz7ZyVa78FVHFGf4N7MWPkfdB6511WTgM1puWwAJyePpK
-a4GoV2RaysZjYGtsUFHpyBzXi7YO+XUj1SmgYNIuV3S17soMnvVuynhhO/ay7RvL
-
--> L7R2f-grease 4ILC 'm6r ?@ IO7~E4:
-8/3HXdMjZdytuWSIN4QsX5oxzZA3yAk9owoN/DctLHJY+o62Wx0ieX+oGiXQmQlq
-2R9qyDQPVVsYlmUEwCcPTL6r9sU
---- xZbC6RcmS2NKOABU90HS9IxRX71dw2K4ezFqmQCx1Rc
-|˜Ý©
˜‡GÏÔ©ó«&
Û5˜„ü<E2809E>nðDÂÆ=Ÿ!•SyÉ*Nèw¹X†×é£ùA©œÏÿÜ»ba•\/¾Sª

secrets/godaddy-api-secret.age

@@ -1,16 +0,0 @@
-age-encryption.org/v1
--> ssh-rsa DQlE7w
-QkdCC22ZrirDnNc5SxzeXw8c5L3VRvvmv/xpegV3qi5Q/UmpjwSNin/i3/94UEKS
-Ql8Vrgj8IC2xnWC+dj+pXgzAIqDIKlqdCsq2IwwjdlT9hezH+t+huQNYS2j7ppYn
-Qgjo+bHMb0oDjxEP+ZMrXLIRmtE379aWGfBb2wzJyAxQBS7Hvqs7Gmc8ZUdklwjY
-bN6AH7OKNRMUC8N9XenMkMHJ7IViu6XNfJvniPqsV0ZM1JY2icEdN4zAudo72iDa
-1uw/s/CZQ07woZEE1bhJG7uPtRj7EIykAQyjkxkvCG3bIjXJKvkWT9BgPQu9U9ha
-D5u2KSEamEZ7+RiLKSk6DkbBYXXed5KPBtGhGAe2BtJO3HocsE/zcPocQCGwT5Ga
-FD576gRfkd+jEg6CSvuZH1ru/adGFbLG2/kbSVJyW2YtR7ViXsxQJcsBbI04XVyX
-sc8iIBE7rwJCykIAMGaVa7xlk9a4p4nwgDuqAakehiUzMa9hnc9ib3oSFybt06EX
-
--> yY7{-grease HYjC1A [Am
-4Gmr6n6e9AnqQbfjMcPTXxoAxOdsY79uXjoT2DhDWasp32p7NdHYBIhb1c4xqcg0
-d8rPIyeU/yh0WsrM
---- 72/rzIIngDXVFlG+nyrCHmztUGwU94DSShk+XIGOw08
-¢?zºÀDHB +ó<>snÇŽ@<40>£hXúÃà{d9Z¢W<C2A2>ŸãvŒ_‡p5.|0ˆ|¡<>