[arch-commits] Commit in apache/trunk (httpd.service)

2015-12-02 Thread Anatol Pomozov 
Date: Wednesday, December 2, 2015 @ 17:22:28
  Author: anatolik
Revision: 252119

FS#47110 Revert revision 249812 (start service as foreground process)

Start service as foreground process causes issues with service restart.
Revert the change until we fix that problem.

Modified:
  apache/trunk/httpd.service

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

Modified: httpd.service
===
--- httpd.service   2015-12-02 16:03:34 UTC (rev 252118)
+++ httpd.service   2015-12-02 16:22:28 UTC (rev 252119)
@@ -3,8 +3,9 @@
 After=network.target remote-fs.target nss-lookup.target
 
 [Service]
-Type=simple
-ExecStart=/usr/bin/apachectl start -DFOREGROUND
+Type=forking
+PIDFile=/run/httpd/httpd.pid
+ExecStart=/usr/bin/apachectl start
 ExecStop=/usr/bin/apachectl graceful-stop
 ExecReload=/usr/bin/apachectl graceful
 PrivateTmp=true

[arch-commits] Commit in apache/trunk (httpd.service)

2015-10-31 Thread Anatol Pomozov 
Date: Saturday, October 31, 2015 @ 22:56:43
  Author: anatolik
Revision: 249895

FS#43486 Use systemd KillMode=mixed

This kill mode sends SIGKILL to all children that are still active after 
timeout.

Modified:
  apache/trunk/httpd.service

---+
 httpd.service |1 +
 1 file changed, 1 insertion(+)

Modified: httpd.service
===
--- httpd.service   2015-10-31 21:44:52 UTC (rev 249894)
+++ httpd.service   2015-10-31 21:56:43 UTC (rev 249895)
@@ -9,6 +9,7 @@
 ExecReload=/usr/bin/apachectl graceful
 PrivateTmp=true
 LimitNOFILE=infinity
+KillMode=mixed
 
 [Install]
 WantedBy=multi-user.target

[arch-commits] Commit in apache/trunk (httpd.service)

2015-10-27 Thread Anatol Pomozov 
Date: Wednesday, October 28, 2015 @ 00:53:12
  Author: anatolik
Revision: 249812

Start apache process in foreground

Modified:
  apache/trunk/httpd.service

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

Modified: httpd.service
===
--- httpd.service   2015-10-27 22:40:56 UTC (rev 249811)
+++ httpd.service   2015-10-27 23:53:12 UTC (rev 249812)
@@ -3,9 +3,8 @@
 After=network.target remote-fs.target nss-lookup.target
 
 [Service]
-Type=forking
-PIDFile=/run/httpd/httpd.pid
-ExecStart=/usr/bin/apachectl start
+Type=simple
+ExecStart=/usr/bin/apachectl start -DFOREGROUND
 ExecStop=/usr/bin/apachectl graceful-stop
 ExecReload=/usr/bin/apachectl graceful
 PrivateTmp=true