Merge pull request 'fix kuma' (#160) from fix-kuma-zone into main

Reviewed-on: #160

config/instance-20221213-1915.nix

@@ -89,6 +89,7 @@
     "L /var/lib/nextcloud - - - - /persist/var/lib/nextcloud"
     "d /persist/var/lib/nextcloud 0750 nextcloud nextcloud - -"
     "L /var/lib/ipfs - - - - /persist/var/lib/ipfs"
+    "L /var/lib/uptime-kuma - - - - /persist/var/lib/uptime-kuma"
   ];
 
   services.postgresql.dataDir = "/persist/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";

config/services/uptime-kuma.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   services.uptime-kuma = {
     enable = true;
     settings = {
@@ -14,4 +18,17 @@
       reverse_proxy http://127.0.0.1:45566
     '';
   };
+  systemd.services.uptime-kuma.serviceConfig = {
+    DynamicUser = lib.mkForce false;
+    User = "uptime-kuma";
+    Group = "uptime-kuma";
+  };
+  users.users.uptime-kuma = {
+    description = "auth.chir.rs";
+    home = "/var/empty";
+    useDefaultShell = true;
+    group = "uptime-kuma";
+    isSystemUser = true;
+  };
+  users.groups.uptime-kuma = {};
 }

secrets/nas.yaml

@@ -31,7 +31,7 @@ password:
     root: ENC[AES256_GCM,data:edK/dud41KmbX6v8Mxn1vVcaCwG0x4YhGjqLTw3oAigmwixTovz+4yUDrkjTQLb3/eMClqQJnjcJsRBv4chSu+UuNorKIsPM0IX9mkTmVH2soGmdPB21HXOXmisGu33oOyhyojbvlaWlFw==,iv:GiXRuhJVPgkAAp7OYufzXtHusnSPOfAP0ztdAtn14GE=,tag:nIOus2VvzE6d+r/aJOLCBw==,type:str]
     darkkirb: ENC[AES256_GCM,data:vmI8B7PWeoKTwOywaGmJmD9gWb09eDcmchx241XrfNvT9QseuSElDTb3OajHornt/OFBPh7EtNi/y1BHF1+DZq0i1tmhYuJy24BLuCPH9VpCb5s5xZZCVtOC6w3qUGqIlLQHYN0Fp1Ap5A==,iv:KkcLQDJSDqeFr3gDByb66MOx8/PbpKpvM9Ym+KMB3jc=,tag:wLLOU4RhWnS+DDSOQLrLHA==,type:str]
 attic:
-    config.toml: ENC[AES256_GCM,data:MXObW3IwmE4qUlEcwdgSJwxrHx1IWos4u5xfJD5FXhoYz7ZzfVy84/EswaQu0f3/KLgxw8nTxnGJtcTWd3s3jBwvMAAo7I+wRNK8N3NJxUAfINf4Fbj3briFt2bGOO769bK0k6Kf+zgpSrtQMv70qTyz+ArV2z03v+s3wzPHt70sanfeCfiZbW9FNjNpMfgf+Wiag50jpiPFrLemgQWZjO0KfKTlbd86MZoIj7PcBHxGjmb9YMoIOt1vNx+L2XjQ8g6C44yHJuhCUWPrylwbn36545GV/JASckY+PioxUvLqwSO1P5V6OipGcW7pnu9UBftpa6dIfeHNq3+U982aCXzE3NevsXxfS7a2hmNFbHgilzJJ+y0uDaQkOPvA4PWcRaPgohBZmaDhTzovxtWeQEWSvqyArbesiNU8uPkcOIxdyJyN+NhVBzt/vQ==,iv:wMiZiVlBX7+m9Iq3mqp0ttjdtKei9rvWfTofhEImOzI=,tag:i1DLB5KxhkwhzRzCV3Dx/g==,type:str]
+    config.toml: ENC[AES256_GCM,data:060O5ICRHpkfTIdrkrLjlJSFKh7HCcMuETkRwf8zSaPQO7NTYnX6nQjd0mYcWZvBPQF3l8cVovja19nKMQAUGTzkBxkpvfylG+UMAfxEpuwTzypyzBwLXQOZPXqdXoEKPu0ghx1nojF08CLALDMlM8J/I7KrlofmSWGO+7142EAhrf1ov5IFmfHBn1vJvfa9aSVKnYDXmMpimO8zxc876YiBiHPe9srTpAlyOu/aOiev0fRmZfWGt7X7/lBap1AcDZFvoe/8Hs0Nb1GSE4ZW9WLPBMFigGK10fCgmlk8rTkaXTNCdZ/yJ24lugganFwssET6HBS/nmDLLMjPkZ0n+6U+JdDcRtXQXq9nwFG9TpMvX9i9K1z24F1/maQ2qUS0OB/YQ/pADLJt/xYfuzfB70FHpN2YYn2Lcmup3xKvbfAL9BFJCA==,iv:3wCOLgoqKoycuitBrQCccRRYulfrhI0a5K8vARU2MM4=,tag:/Zggqm+3CCcUwyc9ubhqcA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -47,8 +47,8 @@ sops:
             WnV3QWxtalIzWFdoQmpDTmJsNGdNOW8K++rFGXy0G6Gcu2gQwSP6xfXInQ/y5nh5
             2oGp8sfOLFWnNI4SWL0ChP47K3C/9ysUHwQnUYPbRafZ/4X6cN40ZQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-07-06T09:11:22Z"
-    mac: ENC[AES256_GCM,data:clJnGoXIezIEc76YYN+CtO9irokgGkQ7+z+bvcr48yg/EYvot8lM7cjhsqeRtRCTvmt01+i3ZpKhpuPpjlK2mjJLB2BW6SKE5dOG+i+ylIfXLev59T/Q97nzSQ45V7FcMAwy8hvlHdEscfBFkDjnVS8Xron/JL5tqqihSkD2y7M=,iv:P7zpvdIaVrMPQk+a9+eMVuf9kcZOdwlpzj/Q+MTyddE=,tag:el8nV63+XudLuyVM9CIaoA==,type:str]
+    lastmodified: "2023-08-02T17:25:38Z"
+    mac: ENC[AES256_GCM,data:iu4NhBQHLTuGAG70rSedcI2cwwDZpzLu18cIxO9JaVRWVanDoYTDXd9sDC7H8oBOmLnypYpXc4kOMCwsY9475W+Yi3HxHWlkcWAPWxAsJL5nIkC7Q9CwrwSCpwtsPyebsLzl299lYPjsNsLpQ6ft/GWnwAn5ISIkKV91k9hduz0=,iv:IB8YVkok7NrX2ayu2iQcwzsP/Tl+WXxjfvQ/1DkRUlk=,tag:z2tlvGWpEbXFrCmuKwUdbA==,type:str]
     pgp:
         - created_at: "2022-04-24T10:34:20Z"
           enc: |

zones/chir.rs.nix

@@ -144,7 +144,7 @@ with dns.lib.combinators; let
     SOA = {
       nameServer = "ns1.chir.rs.";
       adminEmail = "lotte@chir.rs";
-      serial = 34;
+      serial = 35;
     };
     NS = [
       "ns1.chir.rs."
@@ -245,7 +245,7 @@ with dns.lib.combinators; let
       lotte = createZone {};
       ipfs-nocdn = createZone oracleBase;
       ipfs.CNAME = ["ipfs-chir-rs.b-cdn.net."];
-      uptime = createZone oracleBase;
+      status = createZone oracleBase;
 
       int =
         delegateTo [