diff options
-rw-r--r-- | debian/apache2.install | 1 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/forking.conf | 3 |
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 |