From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6DE37138247 for ; Sat, 9 Nov 2013 17:09:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0196CE0A72; Sat, 9 Nov 2013 17:09:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E615E0A72 for ; Sat, 9 Nov 2013 17:09:53 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B692233F17D for ; Sat, 9 Nov 2013 17:09:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5FB66E545C for ; Sat, 9 Nov 2013 17:09:51 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1384016912.dc525fb7d64b5c537fac93a1fca9ff6bdcef2981.polynomial-c@gentoo> Subject: [gentoo-commits] proj/apache:master commit in: 2.2/init/ X-VCS-Repository: proj/apache X-VCS-Files: 2.2/init/apache2.confd 2.2/init/apache2.initd X-VCS-Directories: 2.2/init/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: dc525fb7d64b5c537fac93a1fca9ff6bdcef2981 X-VCS-Branch: master Date: Sat, 9 Nov 2013 17:09:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 895118b6-0b46-4c38-8322-41d4aa76e62f X-Archives-Hash: e200ec9b3192cb45e0ede69e273ae7e1 commit: dc525fb7d64b5c537fac93a1fca9ff6bdcef2981 Author: Lars Wendler gentoo org> AuthorDate: Sat Nov 9 17:08:32 2013 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Nov 9 17:08:32 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=dc525fb7 Fixed location of pidfile. --- 2.2/init/apache2.confd | 2 +- 2.2/init/apache2.initd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/2.2/init/apache2.confd b/2.2/init/apache2.confd index 4635201..c520c20 100644 --- a/2.2/init/apache2.confd +++ b/2.2/init/apache2.confd @@ -42,7 +42,7 @@ APACHE2_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO" # YOU HAVE BEEN WARNED. # PID file -#PIDFILE=/var/run/apache2.pid +#PIDFILE=/run/apache2.pid # timeout for startup/shutdown checks #TIMEOUT=10 diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd index 8cbb030..002e278 100755 --- a/2.2/init/apache2.initd +++ b/2.2/init/apache2.initd @@ -34,7 +34,7 @@ checkconfd() { eerror "apache2.initd-baselayout-1 from /usr/share/doc/apache2-*/" fi - PIDFILE="${PIDFILE:-/var/run/apache2.pid}" + PIDFILE="${PIDFILE:-/run/apache2.pid}" TIMEOUT=${TIMEOUT:-15} SERVERROOT="${SERVERROOT:-/usr/lib/apache2}"