diff options
| author | tron <tron> | 2008-10-12 12:22:25 +0000 |
|---|---|---|
| committer | tron <tron> | 2008-10-12 12:22:25 +0000 |
| commit | e5911aa9e545a72309a2b142f5de96d9fff04646 (patch) | |
| tree | 8ade20c0926f2ff4add09fd71b516d70b0739557 /www | |
| parent | 08387831db1e92b35d183d9e816a1c6cc0baff9f (diff) | |
| download | pkgsrc-e5911aa9e545a72309a2b142f5de96d9fff04646.tar.gz | |
Use the pid file to determine whether "httpd" is still running. This should
make "/etc/rc.d/apache restart" work more reliable and fix PR pkg/39713 by
Martti Kuparinen.
Bump package revision because of this fix.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache22/Makefile | 4 | ||||
| -rw-r--r-- | www/apache22/files/apache.sh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 1c39a941d0d..3097010d76c 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2008/09/17 15:39:06 epg Exp $ +# $NetBSD: Makefile,v 1.34 2008/10/12 12:22:25 tron Exp $ DISTNAME= httpd-2.2.9 PKGNAME= ${DISTNAME:S/httpd/apache/} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} diff --git a/www/apache22/files/apache.sh b/www/apache22/files/apache.sh index 76deb8f6c7e..096338198bb 100644 --- a/www/apache22/files/apache.sh +++ b/www/apache22/files/apache.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: apache.sh,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $ +# $NetBSD: apache.sh,v 1.2 2008/10/12 12:22:25 tron Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -20,6 +20,7 @@ fi name="apache" rcvar=$name command="@PREFIX@/sbin/httpd" +pidfile="/var/run/httpd.pid" ctl_command="@PREFIX@/sbin/apachectl" required_files="@PKG_SYSCONFDIR@/httpd.conf" extra_commands="reload" |