From 9b970d07f384f31737cb3d598913aba16dbc59bb Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 2 Jul 2019 11:53:45 -0400
Subject: [PATCH] nixos/httpd: drop postgresql reference
---
nixos/doc/manual/release-notes/rl-1909.xml | 5 +++++
nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index e04945e27309..53fec6c9b62f 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -148,6 +148,11 @@
</para>
</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
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index d6cb5bd44719..ea9476a7c915 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 ]