nixos/httpd: provide a stable path stable path to the configuration file for reloads

Changed files
+9 -7
nixos
modules
services
web-servers
apache-httpd
+9 -7
nixos/modules/services/web-servers/apache-httpd/default.nix
···
apachectl = pkgs.runCommand "apachectl" { meta.priority = -1; } ''
mkdir -p $out/bin
cp ${pkg}/bin/apachectl $out/bin/apachectl
-
sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f ${httpdConf}|'
+
sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|'
'';
-
-
httpdConf = cfg.configFile;
php = cfg.phpPackage.override { apacheHttpd = pkg; };
···
}) (filter (hostOpts: hostOpts.useACMEHost == null) acmeEnabledVhosts);
in listToAttrs acmePairs;
+
# httpd requires a stable path to the configuration file for reloads
+
environment.etc."httpd/httpd.conf".source = cfg.configFile;
environment.systemPackages = [
apachectl
pkg
···
wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) dependentCertNames);
after = [ "network.target" ] ++ map (certName: "acme-selfsigned-${certName}.service") dependentCertNames;
before = map (certName: "acme-${certName}.service") dependentCertNames;
+
restartTriggers = [ cfg.configFile ];
path = [ pkg pkgs.coreutils pkgs.gnugrep ];
···
'';
serviceConfig = {
-
ExecStart = "@${pkg}/bin/httpd httpd -f ${httpdConf}";
-
ExecStop = "${pkg}/bin/httpd -f ${httpdConf} -k graceful-stop";
-
ExecReload = "${pkg}/bin/httpd -f ${httpdConf} -k graceful";
+
ExecStart = "@${pkg}/bin/httpd httpd -f /etc/httpd/httpd.conf";
+
ExecStop = "${pkg}/bin/httpd -f /etc/httpd/httpd.conf -k graceful-stop";
+
ExecReload = "${pkg}/bin/httpd -f /etc/httpd/httpd.conf -k graceful";
User = cfg.user;
Group = cfg.group;
Type = "forking";
···
# certs are updated _after_ config has been reloaded.
before = sslTargets;
after = sslServices;
+
restartTriggers = [ cfg.configFile ];
# Block reloading if not all certs exist yet.
# Happens when config changes add new vhosts/certs.
unitConfig.ConditionPathExists = map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames;
···
Type = "oneshot";
TimeoutSec = 60;
ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active httpd.service";
-
ExecStartPre = "${pkg}/bin/httpd -f ${httpdConf} -t";
+
ExecStartPre = "${pkg}/bin/httpd -f /etc/httpd/httpd.conf -t";
ExecStart = "/run/current-system/systemd/bin/systemctl reload httpd.service";
};
};