diff options
author | Lucas Savva <lucas@m1cr0man.com> | 2020-08-30 18:38:30 +0100 |
---|---|---|
committer | Lucas Savva <lucas@m1cr0man.com> | 2020-09-02 19:25:30 +0100 |
commit | 61dbf4bf8950c7e3cfeab07ad33cdb00d6a0525d (patch) | |
tree | fee991e4a6dfd00e2acc2cec5bdb155b80688f92 /nixos/modules/services/web-servers | |
parent | 982c5a1f0e7f282f856391304aa4da7bb36c45b8 (diff) | |
download | nixpkgs-61dbf4bf8950c7e3cfeab07ad33cdb00d6a0525d.tar nixpkgs-61dbf4bf8950c7e3cfeab07ad33cdb00d6a0525d.tar.gz nixpkgs-61dbf4bf8950c7e3cfeab07ad33cdb00d6a0525d.tar.bz2 nixpkgs-61dbf4bf8950c7e3cfeab07ad33cdb00d6a0525d.tar.lz nixpkgs-61dbf4bf8950c7e3cfeab07ad33cdb00d6a0525d.tar.xz nixpkgs-61dbf4bf8950c7e3cfeab07ad33cdb00d6a0525d.tar.zst nixpkgs-61dbf4bf8950c7e3cfeab07ad33cdb00d6a0525d.zip |
nixos/acme: Add proper nginx/httpd config reload checks
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.
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 90ea75dfa34..6dd1c85132c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -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"; }; }; |