[csw-devel] SF.net SVN: gar:[8473] csw/mgar/pkg/postgrey/trunk

[bonivart at users.sourceforge.net]

Revision: 8473
          http://gar.svn.sourceforge.net/gar/?rev=8473&view=rev
Author:   bonivart
Date:     2010-02-10 18:03:46 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
postgrey: add conf file

Modified Paths:
--------------
    csw/mgar/pkg/postgrey/trunk/Makefile
    csw/mgar/pkg/postgrey/trunk/checksums
    csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init

Added Paths:
-----------
    csw/mgar/pkg/postgrey/trunk/files/postgrey

Modified: csw/mgar/pkg/postgrey/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgrey/trunk/Makefile	2010-02-10 16:33:10 UTC (rev 8472)
+++ csw/mgar/pkg/postgrey/trunk/Makefile	2010-02-10 18:03:46 UTC (rev 8473)
@@ -22,9 +22,10 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-INITSMF = /etc/opt/csw/init.d/cswpostgrey
+INITSMF = /opt/csw/etc/init.d/cswpostgrey
 USERGROUP = /etc/opt/csw/pkg/CSWpostgrey/cswusergroup
-SAMPLECONF = /etc/opt/csw/postfix/postgrey_whitelist_clients /etc/opt/csw/postfix/postgrey_whitelist_recipients
+SAMPLECONF  = /etc/opt/csw/postfix/postgrey_whitelist_clients /etc/opt/csw/postfix/postgrey_whitelist_recipients
+SAMPLECONF += /etc/opt/csw/postgrey
 
 PATCHFILES = postgrey.p
 
@@ -32,11 +33,12 @@
 
 install-custom:
 	@echo " ==> Installing $(GARNAME) (custom)"
-	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d
-	@ginstall -m 755 $(FILEDIR)/CSWpostgrey.init $(DESTDIR)/etc/opt/csw/init.d/cswpostgrey
+	@ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d
+	@ginstall -m 755 $(FILEDIR)/CSWpostgrey.init $(DESTDIR)/opt/csw/etc/init.d/cswpostgrey
 	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/postfix
 	@ginstall -m 644 $(WORKSRC)/postgrey_whitelist_clients $(DESTDIR)/etc/opt/csw/postfix
 	@ginstall -m 644 $(WORKSRC)/postgrey_whitelist_recipients $(DESTDIR)/etc/opt/csw/postfix
+	@ginstall -m 644 $(WORKSRC)/postgrey $(DESTDIR)/etc/opt/csw/
 	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey
 	@ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey/cswusergroup
 	@ginstall -m 755 -d $(DESTDIR)$(sbindir)

Modified: csw/mgar/pkg/postgrey/trunk/checksums
===================================================================
--- csw/mgar/pkg/postgrey/trunk/checksums	2010-02-10 16:33:10 UTC (rev 8472)
+++ csw/mgar/pkg/postgrey/trunk/checksums	2010-02-10 18:03:46 UTC (rev 8473)
@@ -1,2 +1,2 @@
 524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz
-c1715a65ee323b0b0dcc2fbab9a85425  postgrey.p
+108ad95e20c54d4512f65a19103e2b16  postgrey.p

Modified: csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init
===================================================================
--- csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init	2010-02-10 16:33:10 UTC (rev 8472)
+++ csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init	2010-02-10 18:03:46 UTC (rev 8473)
@@ -1,15 +1,25 @@
 #!/sbin/sh
 
-# 2009-12-02 Peter Bonivart
+#RC_KLEV 0,1,2,S
+#RC_SLEV 3
 
-if [ -f /lib/svc/share/smf_include.sh ]; then
-  . /lib/svc/share/smf_include.sh
-fi
+# rc-script for CSWpostgrey
+# Peter Bonivart, 2010-02-01
 
+# Source SMF includes
+[ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh
+
+# Source config file
+[ -r /etc/opt/csw/postgrey ] && . /etc/opt/csw/postgrey
+
 SERVICE=postgrey
+PATH=$PATH:/usr/bin:/opt/csw/bin
 
-OPTIONS="--inet=10023 -d --whitelist-clients=/etc/opt/csw/postfix/postgrey_whitelist_clients --whitelist-recipients=/etc/opt/csw/postfix/postgrey_whitelist_recipients --pidfile=/var/opt/csw/postgrey/postgrey.pid"
+# Use /etc/opt/csw/postgrey to configure the options instead of editing this file
+#OPTIONS="--inet=10023 -d --whitelist-clients=/etc/opt/csw/postfix/postgrey_whitelist_clients --whitelist-recipients=/etc/opt/csw/postfix/postgrey_whitelist_recipients --pidfile=/var/opt/csw/postgrey/postgrey.pid"
 
+ZONE= # used for initialization, do not change
+
 case "$1" in
   start)
         echo "Starting $SERVICE ..."
@@ -17,7 +27,12 @@
         ;;
   stop)
         echo "Stopping $SERVICE ..."
-        pkill $SERVICE
+        if [ -x /usr/bin/zonename ]; then
+          if [ "`/usr/bin/zonename`" = "global" ]; then
+            ZONE="-z global"
+          fi
+        fi
+        pkill $ZONE -x $SERVICE
         ;;
   restart)
         echo "Restarting $SERVICE ... "

Added: csw/mgar/pkg/postgrey/trunk/files/postgrey
===================================================================
--- csw/mgar/pkg/postgrey/trunk/files/postgrey	                        (rev 0)
+++ csw/mgar/pkg/postgrey/trunk/files/postgrey	2010-02-10 18:03:46 UTC (rev 8473)
@@ -0,0 +1,7 @@
+# This is where you customize some settings of your postgrey installation so
+# you don't have to edit the scripts themselves as they will be replaced during
+# upgrades.
+#
+# Peter Bonivart, OpenCSW
+
+OPTIONS="--inet=10023 -d --whitelist-clients=/etc/opt/csw/postfix/postgrey_whitelist_clients --whitelist-recipients=/etc/opt/csw/postfix/postgrey_whitelist_recipients --pidfile=/var/opt/csw/postgrey/postgrey.pid"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.