mermet: nginx: autogeree.net: add /julm/perso/camera/

diff --git a/hosts/losurdo/syncoid.nix b/hosts/losurdo/syncoid.nix
index 2e56c03c381ae213d407be3ea6c3be124d78646a..bd84f945daddfb8590a6245bfa72035164a6e59d 100644 (file)
--- a/hosts/losurdo/syncoid.nix
+++ b/hosts/losurdo/syncoid.nix
@@ -64,6 +64,7 @@ in
       extraArgs = [
         "--skip-parent"
         "--exclude=rpool/var/cache"
+        "--exclude=rpool/var/lib/nginx"
         "--exclude=rpool/var/log"
         "--exclude=rpool/var/tmp"
       ];

diff --git a/hosts/mermet/nginx.nix b/hosts/mermet/nginx.nix
index be7d5ca4189e6449ce325f1c460f7c532949280f..182ee0b7344f7ebd8945dcd84aac0a9026fbc50b 100644 (file)
--- a/hosts/mermet/nginx.nix
+++ b/hosts/mermet/nginx.nix
@@ -34,11 +34,13 @@ in
       useACMEHost = networking.domain;
     };
   };
-  fileSystems."/var/lib/nginx" = {
-    device = "rpool/var/www";
+  /*
+    fileSystems."/var/lib/nginx" = {
+    device = "rpool/var/lib/nginx";
     fsType = "zfs";
-  };
-  services.sanoid.datasets."rpool/var/www" = {
+    };
+  */
+  services.sanoid.datasets."rpool/var/lib/nginx" = {
     use_template = [ "snap" ];
     daily = 7;
   };

diff --git a/hosts/mermet/nginx/autogeree.net/www.nix b/hosts/mermet/nginx/autogeree.net/www.nix
index f1f5e6dfc55e42478da3979c19292bb331688885..6acd46aa3579ca5774ea03de6b1d4567e99860be 100644 (file)
--- a/hosts/mermet/nginx/autogeree.net/www.nix
+++ b/hosts/mermet/nginx/autogeree.net/www.nix
@@ -7,17 +7,12 @@ let
 in
 {
   systemd.services.nginx.serviceConfig = {
-    BindPaths = [
-      "/home/julm/work/perso:${root}/julm"
-    ];
-    StateDirectory = [
-      "nginx/${domain}/julm"
-    ];
     LogsDirectory = lib.mkForce [
       "nginx/${domain}/${srv}"
     ];
     LoadCredentialEncrypted = [
       "${domain}.${srv}.julm.PC.htpasswd:${inputs.self}/hosts/${hostName}/nginx/${domain}/${srv}/julm/PC/htpasswd.cred"
+      "${domain}.${srv}.julm.perso.camera.htpasswd:${inputs.self}/hosts/${hostName}/nginx/${domain}/${srv}/julm/perso/camera.htpasswd.cred"
     ];
   };
   services.nginx = {
@@ -51,6 +46,15 @@ in
           fancyindex_exact_size off;
         '';
       };
+      locations."/julm/perso/camera/" = {
+        alias = "${root}/julm/perso/camera/";
+        basicAuthFile = "/run/credentials/nginx.service/${domain}.${srv}.julm.perso.camera.htpasswd";
+        extraConfig = ''
+          fancyindex on;
+          fancyindex_name_length 255;
+          fancyindex_exact_size off;
+        '';
+      };
     };
   };
 }

diff --git a/nixos/profiles/services/nginx.nix b/nixos/profiles/services/nginx.nix
index 110576cfda4c271a4530b717b784268d850109c7..5f267b3b35a67d5cace8cba4a59b2bf17cc19233 100644 (file)
--- a/nixos/profiles/services/nginx.nix
+++ b/nixos/profiles/services/nginx.nix
@@ -30,7 +30,7 @@ in
         # whenever upstream uses a list instead of a string.
         LogsDirectory = lib.mkForce [ "nginx" ];
         StateDirectory = [ "nginx" ];
-        StateDirectoryMode = "2770";
+        StateDirectoryMode = "2771";
         #BindPaths = ["/dev/shm/nginx:/var/cache/nginx"];
       };
     };