Revision: 2781
http://gar.svn.sourceforge.net/gar/?rev=2781&view=rev
Author: aigoshin
Date: 2009-01-10 14:36:33 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
nginx: PROTOTYPE_FILTER
Modified Paths:
--------------
csw/mgar/pkg/nginx/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/nginx/trunk/files/cswnginx
Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile 2009-01-09 21:48:13 UTC (rev 2780)
+++ csw/mgar/pkg/nginx/trunk/Makefile 2009-01-10 14:36:33 UTC (rev 2781)
@@ -11,7 +11,7 @@
MASTER_SITES = http://sysoev.ru/nginx/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
DISTFILES += $(call admfiles,CSWnginx,)
-DISTFILES += cswnginx cswnginx.xml svc-cswnginx
+DISTFILES += cswnginx.xml svc-cswnginx
# We define upstream file regex so we can be notifed of new upstream software
release
UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
@@ -20,6 +20,7 @@
GARCOMPILER = GNU
+#CONFIGURE_ARGS += --with-cpu-opt=pentiumpro
CONFIGURE_ARGS += --prefix=$(prefix)/var/nginx
CONFIGURE_ARGS += --conf-path=$(sysconfdir)/nginx/nginx.conf
CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx
@@ -42,11 +43,16 @@
TEST_SCRIPTS =
+PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/log$$$$/ { $$$$6 = "sys" } { print }'
+#PROTOTYPE_FILTER = awk '$$$$3 ~
/\/var\/spool\/nginx\/(client|fastcgi|proxy)$/ { $$$$4 = "700" } { print }'
+
include gar/category.mk
-NGINXDOC=CHANGES CHANGES.ru LICENSE README
+NGINXDOC = CHANGES CHANGES.ru LICENSE README
+
post-install:
+ cp $(WORKDIR)/svc-cswnginx $(WORKDIR)/cswnginx
ginstall -d $(DESTDIR)$(sysconfdir)
ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib
ginstall -d $(DESTDIR)$(docdir)/nginx
Deleted: csw/mgar/pkg/nginx/trunk/files/cswnginx
===================================================================
--- csw/mgar/pkg/nginx/trunk/files/cswnginx 2009-01-09 21:48:13 UTC (rev
2780)
+++ csw/mgar/pkg/nginx/trunk/files/cswnginx 2009-01-10 14:36:33 UTC (rev
2781)
@@ -1,112 +0,0 @@
-#!/bin/sh
-#
-# SMF Method file for nginx
-#
-
-NGINX=/opt/csw/sbin/nginx
-CFGFILE=/opt/csw/etc/nginx/nginx.conf
-VARRUNX=/opt/csw/var/run/nginx
-PIDFILE=${VARRUNX}/nginx.pid
-PIDFILO=${VARRUNX}/nginx.pid.oldbin
-
-[ ! -f ${NGINX} ] && exit $NGINX
-[ ! -f ${CFGFILE} ] && exit $CFGFILE
-
-
-start() {
- $NGINX
- RETVAL=$?
- return $RETVAL
-}
-
-stop() {
- killpidf -TERM $PIDFILO
- killpidf -TERM
-}
-
-check() {
- MSG=`$NGINX -t 2>&1`
- RETVAL=$?
- [ $RETVAL -ne 0 ] && echo $MSG
- return $RETVAL
-}
-
-killpidf() {
- if [ "$2" != "" ]; then
- PIDF=$2
- else
- PIDF=$PIDFILE
- fi
- if [ -s "$PIDF" ]; then
- /bin/kill $1 `/usr/bin/cat $PIDF`
- RETVAL=$?
- else
- RETVAL=1
- fi
- return $RETVAL
-}
-
-reload() {
- killpidf -HUP
- RETVAL=$?
- return $RETVAL
-}
-
-restart() {
- stop
- start
- RETVAL=$?
- return $RETVAL
-}
-
-rotate() {
- killpidf -USR1
- RETVAL=$?
- return $RETVAL
-}
-
-upgrade()
-{
- killpidf -USR2
- RETVAL=$?
- return $RETVAL
-}
-
-
-case "$1" in
-start)
- [ ! -d $VARRUNX ] && /bin/mkdir -p $VARRUNX
- check
- start
- RETVAL=$?
- ;;
-stop)
- stop
- ;;
-refresh|reload)
- check
- RETVAL=$?
- [ $RETVAL -eq 0 ] && reload ||:
- ;;
-restart)
- check
- RETVAL=$?
- [ $RETVAL -eq 0 ] && restart ||:
- ;;
-rotate)
- rotate
- RETVAL=$?
- ;;
-upgrade)
- check
- RETVAL=$?
- [ $RETVAL -eq 0 ] && upgrade ||:
- ;;
-*)
- echo "Usage: $0 {start|stop|refresh|reload|restart|rotate|upgrade}"
- exit 1
- ;;
-esac
-
-RETVAL=$?
-exit $RETVAL
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
