caddy: use module from latest to enable gracefully
All checks were successful
continuous-integration/drone/pr Build is passing

reloading upon config change instead of restarting
This commit is contained in:
teutat3s 2023-07-13 21:06:01 +02:00
parent bce484f55b
commit 17c76ec7b1
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
2 changed files with 6 additions and 6 deletions

View file

@ -5,11 +5,6 @@
self, self,
... ...
}: { }: {
# Changing the Caddyfile should only trigger a reload, not a restart
systemd.services.caddy.reloadTriggers = [
config.services.caddy.configFile
];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d '/data/srv/www/os/download/' 0750 hakkonaut hakkonaut - -" "d '/data/srv/www/os/download/' 0750 hakkonaut hakkonaut - -"
]; ];
@ -18,7 +13,10 @@
enable = lib.mkForce true; enable = lib.mkForce true;
group = "hakkonaut"; group = "hakkonaut";
email = "admins@pub.solar"; email = "admins@pub.solar";
globalConfig = lib.mkForce ""; enableReload = true;
globalConfig = lib.mkForce ''
grace_period 60s
'';
virtualHosts = { virtualHosts = {
"pub.solar" = { "pub.solar" = {
logFormat = lib.mkForce '' logFormat = lib.mkForce ''

View file

@ -27,9 +27,11 @@ in {
profiles.users.barkeeper profiles.users.barkeeper
"${latestModulesPath}/services/misc/gitea.nix" "${latestModulesPath}/services/misc/gitea.nix"
"${latestModulesPath}/services/web-servers/caddy/default.nix"
]; ];
disabledModules = [ disabledModules = [
"services/misc/gitea.nix" "services/misc/gitea.nix"
"services/web-servers/caddy/default.nix"
]; ];
config = { config = {