public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/httpd: override apachectl command to use generated httpd configuration

Browse Source
This commit is contained in:
Aaron Andersen 2020-02-02 08:38:57 -05:00
parent e23ba2a1b0
commit 0b91dfedbc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/web-servers/apache-httpd/default.nix
View File

@ -10,6 +10,12 @@ let
pkg = cfg.package.out; pkg = cfg.package.out;
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}|'
'';
httpdConf = cfg.configFile; httpdConf = cfg.configFile;
php = cfg.phpPackage.override { apacheHttpd = pkg.dev; /* otherwise it only gets .out */ }; php = cfg.phpPackage.override { apacheHttpd = pkg.dev; /* otherwise it only gets .out */ };
@ -641,7 +647,10 @@ in
postRun = "systemctl reload httpd.service"; postRun = "systemctl reload httpd.service";
}) (filterAttrs (name: hostOpts: hostOpts.enableACME) cfg.virtualHosts); }) (filterAttrs (name: hostOpts: hostOpts.enableACME) cfg.virtualHosts);
environment.systemPackages = [ pkg ]; environment.systemPackages = [
apachectl
pkg
];
services.httpd.phpOptions = services.httpd.phpOptions =
'' ''