HASH 3ef446f9b38c
DATE 2024-11-25
SUBJECT website: use tmpfiles.settings
FILES 1 CHANGED
HASH 3ef446f9b38c
DATE 2024-11-25
SUBJECT website: use tmpfiles.settings
FILES 1 CHANGED
┌─ modules/nixos/server/services/website/default.nix ────────────────────────┐
│ diff --git a/modules/nixos/server/services/website/default.nix b/modules/nixos/ser │
│ ver/services/website/default.nix │
│ index af0bf4f..64a0fa2 100644 │
│ --- a/modules/nixos/server/services/website/default.nix │
│ +++ b/modules/nixos/server/services/website/default.nix │
│ @@ -7,13 +7,19 @@ │
│ inherit (lib) mkIf elem; │
│ inherit (config.ooknet.server) services; │
│ inherit (self'.packages) website; │
│ + │
│ + websitePermissions = { │
│ + group = "www"; │
│ + user = "caddy"; │
│ + mode = "0775"; │
│ + }; │
│ in { │
│ config = mkIf (elem "website" services) { │
│ ooknet.server.webserver.caddy.enable = true; │
│ - systemd.tmpfiles.rules = [ │
│ - "d /var/www 0775 caddy www" │
│ - "d /var/www/ooknet.org 0775 caddy www" │
│ - ]; │
│ + systemd.tmpfiles.settings.websiteDirs = { │
│ + "/var/www"."d" = websitePermissions; │
│ + "/var/www/ooknet.org"."d" = websitePermissions; │
│ + }; │
│ │
│ # cursed activation script │
│ # need to find a better way │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ .../services/website/default.nix ───┐
│ diff --git a/modules/nixos/server/services/w │
│ ebsite/default.nix b/modules/nixos/server/se │
│ rvices/website/default.nix │
│ index af0bf4f..64a0fa2 100644 │
│ --- a/modules/nixos/server/services/website/ │
│ default.nix │
│ +++ b/modules/nixos/server/services/website/ │
│ default.nix │
│ @@ -7,13 +7,19 @@ │
│ inherit (lib) mkIf elem; │
│ inherit (config.ooknet.server) services; │
│ inherit (self'.packages) website; │
│ + │
│ + websitePermissions = { │
│ + group = "www"; │
│ + user = "caddy"; │
│ + mode = "0775"; │
│ + }; │
│ in { │
│ config = mkIf (elem "website" services) { │
│ ooknet.server.webserver.caddy.enable = │
│ true; │
│ - systemd.tmpfiles.rules = [ │
│ - "d /var/www 0775 caddy www" │
│ - "d /var/www/ooknet.org 0775 caddy www │
│ " │
│ - ]; │
│ + systemd.tmpfiles.settings.websiteDirs = │
│ { │
│ + "/var/www"."d" = websitePermissions; │
│ + "/var/www/ooknet.org"."d" = websitePe │
│ rmissions; │
│ + }; │
│ │
│ # cursed activation script │
│ # need to find a better way │
└──────────────────────────────────────────────┘
[ BACK TO LOG ]
──────────────────────────────────────────────────────────────────────────────────────
OOKNET
────────────────────────────────────────────────
OOKNET