diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-07-02 11:53:45 -0400 |
|---|---|---|
| committer | Aaron Andersen <aaron@fosslib.net> | 2019-07-20 18:36:24 -0400 |
| commit | 9b970d07f384f31737cb3d598913aba16dbc59bb (patch) | |
| tree | f838a68e7d9a6ecb16359dfe1e84f6e7845ba076 | |
| parent | 0fd69629c703a508a3529463604140caa059e349 (diff) | |
| download | nixpkgs-9b970d07f384f31737cb3d598913aba16dbc59bb.tar nixpkgs-9b970d07f384f31737cb3d598913aba16dbc59bb.tar.gz nixpkgs-9b970d07f384f31737cb3d598913aba16dbc59bb.tar.bz2 nixpkgs-9b970d07f384f31737cb3d598913aba16dbc59bb.tar.lz nixpkgs-9b970d07f384f31737cb3d598913aba16dbc59bb.tar.xz nixpkgs-9b970d07f384f31737cb3d598913aba16dbc59bb.tar.zst nixpkgs-9b970d07f384f31737cb3d598913aba16dbc59bb.zip | |
nixos/httpd: drop postgresql reference
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 5 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index e04945e2730..53fec6c9b62 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -149,6 +149,11 @@ </listitem> <listitem> <para> + The httpd service no longer attempts to start the postgresql service. If you have come to depend + on this behaviour then you can preserve the behavior with the following configuration: + <literal>systemd.services.httpd.after = [ "postgresql.service" ];</literal> + </para> + <para> The option <option>services.httpd.extraSubservices</option> has been marked as deprecated. You may still use this feature, but it will be removed in a future release of NixOS. You are encouraged to convert any diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index d6cb5bd4471..ea9476a7c91 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -671,7 +671,7 @@ in wantedBy = [ "multi-user.target" ]; wants = [ "keys.target" ]; - after = [ "network.target" "fs.target" "postgresql.service" "keys.target" ]; + after = [ "network.target" "fs.target" "keys.target" ]; path = [ httpd pkgs.coreutils pkgs.gnugrep ] |