movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 19:55:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/acme: Add proper nginx/httpd config reload checks

Browse source 
Testing of certs failed randomly when the web server was still
returning old certs even after the reload was "complete". This was
because the reload commands send process signals and do not wait
for the worker processes to restart. This commit adds log watchers
which wait for the worker processes to be restarted.
This commit is contained in:
Lucas Savva 2020-08-30 18:38:30 +01:00
parent 982c5a1f0e
commit 61dbf4bf89
No known key found for this signature in database
GPG key ID: F9CE6D3DCDC78F2D
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/web-servers/apache-httpd/default.nix
View file

@ -795,7 +795,7 @@ in
Type = "oneshot";
TimeoutSec = 60;
ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active httpd.service";
ExecStartPre = "${pkg}/bin/apachectl configtest";
ExecStartPre = "${pkg}/bin/httpd -f ${httpdConf} -t";
ExecStart = "/run/current-system/systemd/bin/systemctl reload httpd.service";
};
};