tried wordpress, removed

common.nix

@@ -23,10 +23,7 @@
       panicOnChecksumMismatch = true;
     };
   };
-  users = {
+  users.users.root.hashedPasswordFile = "/secrets/user/root-pw";
-    groups.secrets.gid = 1578;
-    users.root.hashedPasswordFile = "/secrets/user-root-pw";
-  };
   networking = {
     firewall = {
       allowedTCPPorts = [ 53 80 ];

desktop/configuration.nix

@@ -5,11 +5,16 @@
     hostName = "nixos-desktop";
   };
   users.users = {
+    data = {
+      isNormalUser = true;
+      home = "/home/data";
+      hashedPasswordFile = "/secrets/user/data-pw";
+    };
     bogale = {
       isNormalUser = true;
       home = "/home/bogale";
       extraGroups = [ "wheel" ];
-      hashedPasswordFile = "/secrets/bogale.passwd";
+      hashedPasswordFile = "/secrets/user/bogale-pw";
     };
   };
 }

home/common.nix

@@ -2,6 +2,9 @@
 {
   home.stateVersion = "26.05";
   services.ssh-agent.enable = true;
+  home.packages = with pkgs; [
+    yt-dlp
+  ];
   programs = {
     home-manager.enable = true;
     bash = {

marks

@@ -12,5 +12,5 @@ nixos-install --flake "/mnt/etc/nixos#nixos" --no-channel-copy --no-root-passwd
 systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=0+2+7 <LUKS_DEV>
 
 todo:
-- mediawiki, wordpress
+- mediawiki
 - email tracking

server/configuration.nix

@@ -14,8 +14,7 @@
       vmail.gid = 1819;
     };
     users = {
-      nginx.extraGroups = [ "acme" ];
+      nginx.extraGroups = [ "php" "acme" ];
-      dovecot2.extraGroups = [ "secrets" ];
       root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+wc+3rahpNa+OMS9gaWgMQIxXIKHy4Beku5LBDt+Ow" ];
       php = {
         uid = 1568;

server/mods/mail.nix

@@ -12,12 +12,9 @@
     rspamd = {
       enable = true;
       postfix.enable = true;
-      locals = {
+      locals."redis.conf".text = ''
-        "classifier-bayes.conf".text = "autolearn = true;";
+        servers = "${config.services.redis.servers.rspamd.unixSocket}";
-        "redis.conf".text = ''
+      '';
-          servers = "${config.services.redis.servers.rspamd.unixSocket}";
-        '';
-      };
     };
     dovecot2 = {
       enable = true;

server/mods/sysd.nix

@@ -31,9 +31,13 @@
         serviceConfig.Type = "oneshot";
         script = ''
           . /secrets/tgbot.env
-          ${pkgs.curl}/bin/curl "https://api.telegram.org/$BOT/sendMessage" \
+          for msg in "''${MESSAGES[@]}"; do
-            -X POST -d "chat_id=$CHAT_ID" -d "text=$TEXT" 2> /dev/null | \
+            TEXT="''${msg#*:}"
-            ${pkgs.jq}/bin/jq '.result.date |= strftime("%Y-%m-%d %H:%M:%S")'
+            CHAT_ID="''${msg%%:*}"
+            ${pkgs.curl}/bin/curl -X POST "https://api.telegram.org/$BOT/sendMessage" \
+              -d "chat_id=$CHAT_ID" -d "text=$TEXT" 2> /dev/null | ${pkgs.jq}/bin/jq
+            sleep 1
+          done
         '';
       };
       network-watchdog = {
@@ -43,12 +47,10 @@
         };
         script = ''
           if [ ! -e /run/network.failures ] || \
-            ${pkgs.iputils}/bin/ping -c 1 -W 3 1.1.1.1 &> /dev/null; then
+            ${pkgs.iputils}/bin/ping -c 1 -W 3 1.1.1.1; then
             failures=0
           else
             failures=$((1+$(cat /run/network.failures)))
-          fi
-          if [ $failures -gt 0 ]; then
             echo "<5>failures = $failures"
           fi
           if [ $failures -ge 3 ]; then

server/mods/web.nix

@@ -59,11 +59,9 @@
       '';
       localNetworks = ''
         allow fc00::/64;
-        allow fc01::/64;
+        allow fc01::/120;
-        allow fc02::/64;
         allow 10.0.0.0/16;
-        allow 10.1.0.0/16;
+        allow 10.1.0.0/24;
-        allow 10.2.0.0/16;
         deny all;
       '';
     in {
@@ -76,7 +74,12 @@
       locations = {
         "/app/".extraConfig = phpPool "default";
         "/git/".proxyPass = "http://127.0.0.1:8039/";
-        "/priv/".extraConfig = ''${localNetworks} ${phpPool "default"}'';
+        "/local/".extraConfig = ''${phpPool "default"} ${localNetworks}'';
+        "/local/net/".extraConfig = ''
+          allow fc01::/64;
+          allow 10.1.0.0/16;
+          deny all;
+        '';
         "/vw/" = {
           proxyWebsockets = true;
           extraConfig = localNetworks;