work-around-apache-fail.diff: Dropped, apache supports systemd now so this should not be needed.

debian/changelog

@@ -3,6 +3,8 @@ freeipa (4.4.2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * configure-apache-from-installer.diff: Dropped, upstream.
   * patches: Refreshed.
+  * work-around-apache-fail.diff: Dropped, apache supports systemd now
+    so this should not be needed.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 01 Dec 2016 08:25:03 +0200
 

debian/patches/series

@@ -1,5 +1,4 @@
 # not upstreamable
-work-around-apache-fail.diff
 prefix.patch
 hack-libarch.diff
 enable-mod-nss-during-setup.diff

debian/patches/work-around-apache-fail.diff

@@ -1,49 +0,0 @@
-Description: service apache2 restart fails on sid, so don't do that
---- a/ipaserver/install/httpinstance.py
-+++ b/ipaserver/install/httpinstance.py
-@@ -191,7 +191,8 @@ class HTTPInstance(service.Service):
- 
-     def __start(self):
-         self.backup_state("running", self.is_running())
--        self.restart()
-+        self.stop()
-+        self.start()
- 
-     def __enable(self):
-         self.backup_state("enabled", self.is_enabled())
---- a/install/tools/ipa-dns-install
-+++ b/install/tools/ipa-dns-install
-@@ -153,7 +153,8 @@ def main():
-     fstore = sysrestore.FileStore(paths.SYSRESTORE)
-     http = httpinstance.HTTPInstance(fstore)
-     service.print_msg("Restarting the web server")
--    http.restart()
-+    http.stop()
-+    http.start()
- 
-     # execute ipactl to refresh services status
-     ipautil.run(['ipactl', 'start', '--ignore-service-failures'],
---- a/ipaserver/install/server/install.py
-+++ b/ipaserver/install/server/install.py
-@@ -877,7 +877,8 @@ def install(installer):
- 
-     # Restart httpd to pick up the new IPA configuration
-     service.print_msg("Restarting the web server")
--    http.restart()
-+    http.stop()
-+    http.start()
- 
-     # update DNA shared config entry is done as far as possible
-     # from restart to avoid waiting for its creation
---- a/ipaserver/install/server/replicainstall.py
-+++ b/ipaserver/install/server/replicainstall.py
-@@ -881,7 +881,8 @@ def install(installer):
- 
-     # Restart httpd to pick up the new IPA configuration
-     service.print_msg("Restarting the web server")
--    http.restart()
-+    http.stop()
-+    http.start()
- 
-     # Call client install script
-     service.print_msg("Configuring client side components")