Merge branch 'main' of ssh://gitea.xeovalyte.dev:2222/xeovalyte/nix

.sops.yaml

@@ -1,7 +1,7 @@
 keys:
   - &v-th-ctr-01 age1cs2p7tgk9356tjmet6526k3ghwq9we82nz6z7qggqns656paku6sx30tkg
 creation_rules:
-  - path_regex: secrets/secrets.yaml$
+  - path_regex: secrets/deploy.yaml$
     key_groups:
     - age:
       - *v-th-ctr-01

hosts/v-th-ctr-01/home.nix

@@ -49,6 +49,7 @@
         pingvin-share.enable = true;
         vaultwarden.enable = true;
         paperless-ngx.enable = true;
+        beszel.enable = true;
       };
     };
 

modules/home/containers/beszel.nix

@@ -35,12 +35,17 @@ in {
       image = "henrygd/beszel-agent:latest";
       network = "proxy";
       volumes = [
-        "%h/containers/beszel/beszel_socket:/beszel_socket" 
+        "%h/containers/beszel/socket:/beszel_socket" 
         "/run/user/1000/podman/podman.sock:/var/run/podman.sock:ro"
+
+        "${config.sops.secrets."containers/beszel/key".path}:/run/secrets/key" 
       ];
+      user = 1000;
+      userNS = "keep-id";
       environment = {
         LISTEN = "/beszel_socket/beszel.sock";
         KEY_FILE = "/run/secrets/key";
+        DOCKER_HOST = "unix:///var/run/podman.sock";
       };
     };
 

modules/home/containers/caddy.nix

@@ -88,6 +88,11 @@ in {
         handle @paperless-ngx {
           reverse_proxy paperless-ngx:8000
         }
+
+        @beszel host monitor.local.tbmrs.nl
+        handle @beszel {
+          reverse_proxy beszel:8090
+        }
       }
     '';
   };

modules/home/containers/homepage.nix

@@ -59,6 +59,15 @@ in {
               container = "uptime-kuma";
             };    
           }
+          {
+            "Beszel" = {
+              href = "https://monitor.local.tbmrs.nl";
+              description = "Server monitoring";
+              icon = "beszel";
+              server = "podman";
+              container = "beszel";
+            };    
+          }
         ];
       }
       {

modules/home/default.nix

@@ -35,5 +35,6 @@
     ./containers/pingvin-share.nix
     ./containers/vaultwarden.nix
     ./containers/paperless-ngx.nix
+    ./containers/beszel.nix
   ];
 }

secrets/deploy.yaml

@@ -2,6 +2,8 @@ example-key: ENC[AES256_GCM,data:zQ4Sb+IOxM/JB/0KZQ==,iv:SgpzREfqbgBgd8psV7Optl4
 containers:
     pingvin-share:
         oidc-secret: ENC[AES256_GCM,data:jO5fvIK/1XnFweqKvedPMED0xvsqErjDP+eT7wAwXFuREbS6KakwY7pUzi20wdI0,iv:SnnmXiZoawpZV83483esQ1TIaFTACiIUcA6hcoXsw0I=,tag:cC/ftyj8jlK1re/rX4IiEw==,type:str]
+    beszel:
+        key: ENC[AES256_GCM,data:rRtx8Jx/aHOqeRa9dlyc42/62UwwqhkiLDLnZCM65rpW5nL5cQG2dS81YOMVPrE7Sa/cHlE3bvxqETaxMmsJGYukjmZph8skpF0qukCDe4Q=,iv:OS/+jF4MtwPdijXPpG2pgpJQTYyer9bms97B+kO8XhI=,tag:va7jCSGrXp2YKBlYzLI39g==,type:str]
     paperless-ngx:
         db-password: ENC[AES256_GCM,data:H21HVshmFuWJ5qNIrjm0VMGHEsT7cCvScgamU+CAaNZ6j5ux/r4xiF9zP7Qh40sKTOvyoWGTcHGPHE5ClpGuQA==,iv:tDIRfThBOfHr+gGRqywlHAk/x4MkhHRFsJEp5nnlGPA=,tag:XbYKD90l3u93Ur4VOqOn6w==,type:str]
         secret: ENC[AES256_GCM,data:+1hriBiSbt+zUjEkBTEM90PFNlxfNwRAmz8wHyeyOnq6ThI+PtlDu83sunBFL2FUYJX0N4h3R4FvJBUkrPr0NQ==,iv:zzhFaoLnskspp1S291KABLZITgcof63cjShnsZrlAmw=,tag:+aafTLgZVBWeclQLQvVlQg==,type:str]
@@ -21,8 +23,8 @@ sops:
             bGpsMnpoQWlxbmlobVdVSjU2ZWp1dGMKql+6ZqtuixZ9TJgJMaTOFsB0gsLLvuqE
             ZQikUHunrP8d5n/TvzL4VyIF2Oqy+cjTnjX/9fcqsjB6w3oY4qDXkg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-04-30T09:15:42Z"
+    lastmodified: "2025-04-30T13:11:24Z"
-    mac: ENC[AES256_GCM,data:Mxq3LnXRpnVv/U7QEGL5I3gF3y8W8IfsdTvinIsn5Qi6m04JinyJ0Vgr4JbMstB/8gh259MsAO2na7/vZ8brLuol0X8vZeIlgIoX8DazuI6dpNr284zPWsiRNr8gzBViYDRb4GVf+GF11iXcw3UlJE8uB+N4z4Y4sUbobOt402c=,iv:G86XwJp6ZRB8ioDbNDGKxLPNIcAmcusH/blT/8FKFlk=,tag:emMQZ7TAJGy7yqSpD7+1Cg==,type:str]
+    mac: ENC[AES256_GCM,data:JA1T9q0otjshJWyb8fingvD0CmYyTKdhvNMI3RVoZaMEAwBV4AwMCftG9zWMOgof4NcG4EhdOI7KG7qhctpo25K9j5IhaY8GA/p7BStBopuowTTUZecWHxXy4OFEtuW1PXBGrkgfkupV+RZfeisoa1gGFhQ2tW+fOqtoTFFCLHA=,iv:CM5zgvA2krzLHGiVeiSTVzcswwk9+QJmNCr+3hqw+To=,tag:H0x1UasoXNb38+Cq0CP0YA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.4