summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--custom/ymir-nginx.nix2
-rw-r--r--ymir.nix5
2 files changed, 4 insertions, 3 deletions
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index eece8ffb..bc4e0a78 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -250,7 +250,7 @@ in {
250 250
251 server_name ~^ftp\.(yggdrasil\.li|141\.li|praseodym\.org)$; 251 server_name ~^ftp\.(yggdrasil\.li|141\.li|praseodym\.org)$;
252 252
253 client_body_temp_path /tmp/webdav; 253 client_body_temp_path /run/nginx/webdav;
254 254
255 location / { 255 location / {
256 root /srv/ftp/$remote_user; 256 root /srv/ftp/$remote_user;
diff --git a/ymir.nix b/ymir.nix
index ee540b59..cf8f43a6 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -813,14 +813,15 @@ in rec {
813 systemd.services."acme-yggdrasil.li" = { 813 systemd.services."acme-yggdrasil.li" = {
814 requires = [ "nginx.service" ]; 814 requires = [ "nginx.service" ];
815 serviceConfig = { 815 serviceConfig = {
816 ReadWritePaths = [ "/srv/www/acme" "/tmp/webdav" ]; 816 ReadWritePaths = [ "/srv/www/acme" ];
817 RuntimeDirectory = [ "nginx/webdav" ];
818 RuntimeDirectoryMode = "0700";
817 }; 819 };
818 }; 820 };
819 systemd.tmpfiles.rules 821 systemd.tmpfiles.rules
820 = let mkAcmeDir = domain: "d /srv/www/acme 0775 root ssl 10d -"; 822 = let mkAcmeDir = domain: "d /srv/www/acme 0775 root ssl 10d -";
821 in map mkAcmeDir myDomains ++ [ 823 in map mkAcmeDir myDomains ++ [
822 "L /etc/nixos - - - - /root/nixos" 824 "L /etc/nixos - - - - /root/nixos"
823 "d /tmp/webdav 0700 nginx nginx 1h"
824 ]; 825 ];
825 826
826 services.uucp = { 827 services.uucp = {