titaniumtown/server-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup caddy

Browse Source
This commit is contained in:
Simon Gardling 2025-08-20 10:41:31 -04:00
parent 40729a2597
commit 4865e0276b
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/caddy.nix
View File

@ -9,7 +9,7 @@
{
imports = [
(lib.serviceMountDeps "caddy" [
"/var/lib/caddy"
config.services.caddy.dataDir
service_configs.https.data_dir
])
];
@ -30,8 +30,8 @@
};
systemd.tmpfiles.rules = [
"d ${service_configs.https.data_dir} 750 ${config.services.caddy.user} ${config.services.caddy.group}"
"d /var/lib/caddy 750 ${config.services.caddy.user} ${config.services.caddy.group}"
"d ${service_configs.https.data_dir} 770 ${config.services.caddy.user} ${config.services.caddy.group}"
"d ${config.services.caddy.dataDir} 700 ${config.services.caddy.user} ${config.services.caddy.group}"
];
systemd.packages = with pkgs; [ nssTools ];

14
services/minecraft.nix
View File

@ -116,21 +116,21 @@
};
};
services.caddy.virtualHosts."map.${service_configs.https.domain}".extraConfig = ''
services.caddy.virtualHosts = lib.mkIf (config.services.caddy.enable) {
"map.${service_configs.https.domain}".extraConfig = ''
root * ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}/squaremap/web
file_server browse
'';
};
users.users.${config.services.caddy.user}.extraGroups = [
users.users = lib.mkIf (config.services.caddy.enable) {
${config.services.caddy.user}.extraGroups = [
# for `map.gardling.com`
"minecraft"
];
};
systemd.tmpfiles.rules = [
"d ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name} 0750 minecraft minecraft"
];
users.users.${username}.extraGroups = [
"minecraft"
"d ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name} 0750 ${config.services.minecraft-servers.user} ${config.services.minecraft-servers.group}"
];
}