[csw-devel] SF.net SVN: gar:[6025] csw/mgar/pkg/sendmail/trunk/files

valholla at users.sourceforge.net valholla at users.sourceforge.net
Thu Aug 13 23:22:24 CEST 2009 

Revision: 6025
          http://gar.svn.sourceforge.net/gar/?rev=6025&view=rev
Author:   valholla
Date:     2009-08-13 21:22:21 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
file tweaks

Modified Paths:
--------------
    csw/mgar/pkg/sendmail/trunk/files/cswsendmail
    csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW
    csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW

Modified: csw/mgar/pkg/sendmail/trunk/files/cswsendmail
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/cswsendmail	2009-08-13 20:53:28 UTC (rev 6024)
+++ csw/mgar/pkg/sendmail/trunk/files/cswsendmail	2009-08-13 21:22:21 UTC (rev 6025)
@@ -6,13 +6,13 @@
 #ident	"@(#)sendmail	1.19	01/12/05 SMI"
 # Modified for CSW by Alex Moore 01/01/2004
 
+CSW_DIR="/opt/csw"
 ERRMSG1='WARNING: /var/mail is NFS-mounted without setting actimeo=0,'
 ERRMSG2='this can cause mailbox locking and access problems.'
 SERVER_PID_FILE="/var/run/sendmail.pid"
-CLIENT_PID_FILE="/opt/csw/var/spool/clientmqueue/sm-client.pid"
-DEFAULT_FILE="/opt/csw/etc/default/sendmail"
-ALIASES_FILE="/opt/csw/etc/mail/aliases"
-CSW_DIR="/opt/csw"
+CLIENT_PID_FILE="/var${CSW_DIR}/spool/clientmqueue/sm-client.pid"
+DEFAULT_FILE="${CSW_DIR}/etc/default/sendmail"
+ALIASES_FILE="${CSW_DIR}/etc/mail/aliases"
 
 check_queue_interval_syntax()
 {
@@ -34,14 +34,14 @@
 	;;
 
 'start')
-	if [ -f $CSW_DIR/lib/sendmail -a -f $CSW_DIR/etc/mail/sendmail.cf ]; then
-		if [ ! -d $CSW_DIR/var/spool/mqueue ]; then
-			/usr/bin/mkdir -pm 0750 $CSW_DIR/var/spool/mqueue
-			/usr/bin/chown root:bin $CSW_DIR/var/spool/mqueue
+	if [ -f ${CSW_DIR}/lib/sendmail -a -f ${CSW_DIR}/etc/mail/sendmail.cf ]; then
+		if [ ! -d /var${CSW_DIR}/spool/mqueue ]; then
+			/usr/bin/mkdir -pm 0750 /var${CSW_DIR}/spool/mqueue
+			/usr/bin/chown root:bin /var${CSW_DIR}/spool/mqueue
 		fi
 		if [ ! -f $ALIASES_FILE.db ] && [ ! -f $ALIASES_FILE.dir ] \
 		    && [ ! -f $ALIASES_FILE.pag ]; then
-			$CSW_DIR/bin/newaliases
+			${CSW_DIR}/bin/newaliases
 		fi
 		MODE="-bd"
 		[ -f $DEFAULT_FILE ] && . $DEFAULT_FILE
@@ -62,8 +62,8 @@
 		fi
 		check_queue_interval_syntax $CLIENTQUEUEINTERVAL
 		CLIENTQUEUEINTERVAL=$answer
-		$CSW_DIR/lib/sendmail -L sm-mta $MODE -q$QUEUEOPTION$QUEUEINTERVAL $OPTIONS &
-		$CSW_DIR/lib/sendmail -L sm-msp -Ac -q$CLIENTQUEUEINTERVAL $CLIENTOPTIONS &
+		${CSW_DIR}/lib/sendmail -L sm-mta $MODE -q$QUEUEOPTION$QUEUEINTERVAL $OPTIONS &
+		${CSW_DIR}/lib/sendmail -L sm-msp -Ac -q$CLIENTQUEUEINTERVAL $CLIENTOPTIONS &
 		#
 		# ETRN_HOSTS should be of the form
 		# "s1:c1.1,c1.2        s2:c2.1 s3:c3.1,c3.2,c3.3"

Modified: csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW	2009-08-13 20:53:28 UTC (rev 6024)
+++ csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW	2009-08-13 21:22:21 UTC (rev 6025)
@@ -65,7 +65,7 @@
 
 Cwlocalhost
 # file containing names of hosts for which we receive email
-Fw/etc/mail/local-host-names
+Fw/opt/csw/etc/mail/local-host-names
 
 # my official domain name
 # ... define this only if sendmail cannot automatically determine your domain
@@ -94,7 +94,7 @@
 
 
 # Hosts for which relaying is permitted ($=R)
-FR-o /etc/mail/relay-domains
+FR-o /opt/csw/etc/mail/relay-domains
 
 # arithmetic map
 Karith arith
@@ -139,7 +139,7 @@
 O AliasWait=10
 
 # location of alias file
-O AliasFile=/etc/mail/aliases
+O AliasFile=/opt/csw/etc/mail/aliases
 
 # minimum number of free blocks on filesystem
 O MinFreeBlocks=100
@@ -160,7 +160,7 @@
 O DeliveryMode=background
 
 # error message header/file
-#O ErrorHeader=/etc/mail/error-header
+#O ErrorHeader=/opt/csw/etc/mail/error-header
 
 # error mode
 #O ErrorMode=print
@@ -181,7 +181,7 @@
 #O MaxHopCount=25
 
 # location of help file
-O HelpFile=/etc/mail/helpfile
+O HelpFile=/opt/csw/etc/mail/helpfile
 
 # ignore dots as terminators in incoming messages?
 #O IgnoreDots=False
@@ -335,7 +335,7 @@
 #O DefaultUser=mailnull
 
 # list of locations of user database file (null means no lookup)
-#O UserDatabaseSpec=/etc/mail/userdb
+#O UserDatabaseSpec=/opt/csw/etc/mail/userdb
 
 # fallback MX host
 #O FallbackMXhost=fall.back.host.net
@@ -383,7 +383,7 @@
 #O DefaultCharSet=unknown-8bit
 
 # service switch file (name hardwired on Solaris, Ultrix, OSF/1, others)
-#O ServiceSwitchFile=/etc/mail/service.switch
+#O ServiceSwitchFile=/opt/csw/etc/mail/service.switch
 
 # hosts file (normally /etc/hosts)
 #O HostsFile=/etc/hosts
@@ -497,7 +497,7 @@
 #O AuthRealm
 
 # default authentication information for outgoing connections
-#O DefaultAuthInfo=/etc/mail/default-auth-info
+#O DefaultAuthInfo=/opt/csw/etc/mail/default-auth-info
 
 # SMTP AUTH flags
 #O AuthOptions
@@ -557,7 +557,7 @@
 #####################
 
 # this is equivalent to setting class "t"
-#Ft/etc/mail/trusted-users
+#Ft/opt/csw/etc/mail/trusted-users
 Troot
 Tdaemon
 Tuucp

Modified: csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW	2009-08-13 20:53:28 UTC (rev 6024)
+++ csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW	2009-08-13 21:22:21 UTC (rev 6025)
@@ -86,7 +86,7 @@
 
 
 # Hosts for which relaying is permitted ($=R)
-FR-o /etc/mail/relay-domains
+FR-o /opt/csw/etc/mail/relay-domains
 
 # arithmetic map
 Karith arith
@@ -131,7 +131,7 @@
 O AliasWait=10
 
 # location of alias file
-#O AliasFile=/etc/mail/aliases
+#O AliasFile=/opt/csw/etc/mail/aliases
 
 # minimum number of free blocks on filesystem
 O MinFreeBlocks=100
@@ -152,7 +152,7 @@
 O DeliveryMode=i
 
 # error message header/file
-#O ErrorHeader=/etc/mail/error-header
+#O ErrorHeader=/opt/csw/etc/mail/error-header
 
 # error mode
 #O ErrorMode=print
@@ -173,7 +173,7 @@
 #O MaxHopCount=25
 
 # location of help file
-O HelpFile=/etc/mail/helpfile
+O HelpFile=/opt/csw/etc/mail/helpfile
 
 # ignore dots as terminators in incoming messages?
 #O IgnoreDots=False
@@ -327,7 +327,7 @@
 #O DefaultUser=mailnull
 
 # list of locations of user database file (null means no lookup)
-#O UserDatabaseSpec=/etc/mail/userdb
+#O UserDatabaseSpec=/opt/csw/etc/mail/userdb
 
 # fallback MX host
 #O FallbackMXhost=fall.back.host.net
@@ -375,7 +375,7 @@
 #O DefaultCharSet=unknown-8bit
 
 # service switch file (name hardwired on Solaris, Ultrix, OSF/1, others)
-#O ServiceSwitchFile=/etc/mail/service.switch
+#O ServiceSwitchFile=/opt/csw/etc/mail/service.switch
 
 # hosts file (normally /etc/hosts)
 #O HostsFile=/etc/hosts
@@ -489,7 +489,7 @@
 #O AuthRealm
 
 # default authentication information for outgoing connections
-#O DefaultAuthInfo=/etc/mail/default-auth-info
+#O DefaultAuthInfo=/opt/csw/etc/mail/default-auth-info
 
 # SMTP AUTH flags
 #O AuthOptions
@@ -549,7 +549,7 @@
 #####################
 
 # this is equivalent to setting class "t"
-#Ft/etc/mail/trusted-users
+#Ft/opt/csw/etc/mail/trusted-users
 Troot
 Tdaemon
 Tuucp


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

More information about the devel mailing list