From f4f49e5231d8cde09909b5efe37a88df4666ca9e0c46e3b59b4b23e752403d74 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Tue, 3 Feb 2015 16:13:11 +0000 Subject: [PATCH] Accepting request 283916 from home:pgajdos - httpd2.pid in rc.apache2 was wrong [bnc#898193] OBS-URL: https://build.opensuse.org/request/show/283916 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=430 --- apache2.changes | 5 +++++ rc.apache2 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apache2.changes b/apache2.changes index 6ab22f0..256698f 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 3 15:12:04 UTC 2015 - pgajdos@suse.com + +- httpd2.pid in rc.apache2 was wrong [bnc#898193] + ------------------------------------------------------------------- Fri Jan 16 04:24:04 UTC 2015 - crrodriguez@opensuse.org diff --git a/rc.apache2 b/rc.apache2 index ba3807b..4a9fea1 100644 --- a/rc.apache2 +++ b/rc.apache2 @@ -29,7 +29,7 @@ pname=apache2 : ${sysconfdir:=/etc/$pname} : ${apache_link:=/usr/sbin/httpd2} : ${sysconfig_apache:=/etc/sysconfig/$pname} -: ${pidfile:=/var/run/httpd2.pid} +: ${pidfile:=/var/run/httpd.pid} : ${logdir:=/var/log/$pname} : ${homedir:=/var/lib/$pname}