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

[Anatol Pomozov]

    Date: Monday, December 7, 2015 @ 17:53:14
  Author: anatolik
Revision: 253534

upgpkg: apache 2.4.17-5

Avoid using apachectl wrapper and use httpd binary directly

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/httpd.logrotate
  apache/trunk/httpd.service

-----------------+
 PKGBUILD        |    6 +++---
 httpd.logrotate |    2 +-
 httpd.service   |    9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-07 16:43:39 UTC (rev 253533)
+++ PKGBUILD	2015-12-07 16:53:14 UTC (rev 253534)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.17
-pkgrel=4
+pkgrel=5
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -42,8 +42,8 @@
 sha256sums=('331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798'
             'SKIP'
             '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
-            '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
-            '4d16b6ddeafbc94bc7109017be61788064f455c7ab453cce19a35a30a1f5e64f'
+            '09165b754414347592a60e3cab3904cc441cfe2100eb66c7c76e6b0f18280ec8'
+            'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
             'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
             'eb9033e039e24cd443c861af0853dd8a8f7369170a393ef25fd31a627f6d40db')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski

Modified: httpd.logrotate
===================================================================
--- httpd.logrotate	2015-12-07 16:43:39 UTC (rev 253533)
+++ httpd.logrotate	2015-12-07 16:53:14 UTC (rev 253534)
@@ -1,6 +1,6 @@
 /var/log/httpd/*log {
    missingok
    postrotate
-      /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+      /usr/bin/systemctl reload httpd.service 2>/dev/null || true
    endscript
 }

Modified: httpd.service
===================================================================
--- httpd.service	2015-12-07 16:43:39 UTC (rev 253533)
+++ httpd.service	2015-12-07 16:53:14 UTC (rev 253534)
@@ -3,11 +3,10 @@
 After=network.target remote-fs.target nss-lookup.target
 
 [Service]
-Type=forking
-PIDFile=/run/httpd/httpd.pid
-ExecStart=/usr/bin/apachectl start
-ExecStop=/usr/bin/apachectl graceful-stop
-ExecReload=/usr/bin/apachectl graceful
+Type=simple
+ExecStart=/usr/bin/httpd -k start -DFOREGROUND
+ExecStop=/usr/bin/httpd -k graceful-stop
+ExecReload=/usr/bin/httpd -k graceful
 PrivateTmp=true
 LimitNOFILE=infinity
 KillMode=mixed