mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 14:10:33 +03:00
To ease migration to systemd, generate units from the ‘jobs’ option
Also get rid of the ‘buildHook’ job option because it wasn't very useful.
This commit is contained in:
parent
66f4d10843
commit
4a95f8996b
15 changed files with 108 additions and 172 deletions
|
@ -532,18 +532,7 @@ in
|
|||
'';
|
||||
|
||||
jobs.httpd =
|
||||
{ # Statically verify the syntactic correctness of the generated
|
||||
# httpd.conf. !!! this is impure! It doesn't just check for
|
||||
# syntax, but also whether the Apache user/group exist,
|
||||
# whether SSL keys exist, etc.
|
||||
buildHook =
|
||||
''
|
||||
echo
|
||||
echo '=== Checking the generated Apache configuration file ==='
|
||||
${httpd}/bin/httpd -f ${httpdConf} -t || true
|
||||
'';
|
||||
|
||||
description = "Apache HTTPD";
|
||||
{ description = "Apache HTTPD";
|
||||
|
||||
startOn = "started networking and filesystem"
|
||||
# Hacky. Some subservices depend on Postgres
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue