From 3aad8e0ac5256cafbdaeaa17653e700ba8ead0a9 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 5 Oct 2012 18:48:49 +0200
Subject: httpd: sync with rawhide

---
 httpd.service | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'httpd.service')

diff --git a/httpd.service b/httpd.service
index 0e9f0c0..b176a92 100644
--- a/httpd.service
+++ b/httpd.service
@@ -3,10 +3,9 @@ Description=The Apache HTTP Server
 After=network.target remote-fs.target nss-lookup.target
 
 [Service]
-Type=forking
-PIDFile=/run/httpd/httpd.pid
+Type=notify
 EnvironmentFile=/etc/sysconfig/httpd
-ExecStart=/usr/sbin/httpd $OPTIONS
+ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
 ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
 ExecStop=/usr/sbin/httpd $OPTIONS -k graceful-stop
 PrivateTmp=true
-- 
cgit