summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2016-09-20 17:33:21 +0200
committerRaphaël Hertzog <hertzog@debian.org>2016-09-20 19:05:51 +0200
commit53bda30687048663706cb04a8d728e61e356368b (patch)
treefa5e22d91e3e4fb6aae00d2ef2700d763f54d6e2
parent0a6976aa5ed4a42e4ada6fb9f279423e8fbeec8a (diff)
downloadapache2-53bda30687048663706cb04a8d728e61e356368b.tar.gz
Drop /lib/systemd/system/apache2.service.d/forking.conf
We have proper native systemd support now.
-rw-r--r--debian/apache2.install1
-rw-r--r--debian/changelog2
-rw-r--r--debian/forking.conf3
3 files changed, 2 insertions, 4 deletions
diff --git a/debian/apache2.install b/debian/apache2.install
index 49725114..798d2f0b 100644
--- a/debian/apache2.install
+++ b/debian/apache2.install
@@ -8,4 +8,3 @@ debian/apache2ctl /usr/sbin
debian/a2query /usr/sbin
debian/ask-for-passphrase /usr/share/apache2/
debian/debhelper/apache2-maintscript-helper /usr/share/apache2/
-debian/forking.conf /lib/systemd/system/apache2.service.d
diff --git a/debian/changelog b/debian/changelog
index 8eb8e88b..35d6988d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ apache2 (2.4.23-5) UNRELEASED; urgency=medium
support.
* Improve setup-instance to rely on the systemd apache2@instance.service for
multi-instance support.
+ * Drop /lib/systemd/system/apache2.service.d/forking.conf now that we have
+ proper native systemd support.
-- Stefan Fritsch <sf@debian.org> Sat, 13 Aug 2016 13:38:30 +0200
diff --git a/debian/forking.conf b/debian/forking.conf
deleted file mode 100644
index b031203e..00000000
--- a/debian/forking.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-Type=forking
-RemainAfterExit=no