[svn-commits] diruggles: trunk r300761 - in /trunk: Makefile contrib/scripts/safe_asterisk

[SVN commits to the Digium repositories]

Author: diruggles
Date: Wed Jan  5 19:41:57 2011
New Revision: 300761

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=300761
Log:
update safe_asterisk script

change defaults to make a little more sense. Default log location is now asterisk log location and default email notification has been changed to root on the local machine

Review: https://reviewboard.asterisk.org/r/1067/

Modified:
    trunk/Makefile
    trunk/contrib/scripts/safe_asterisk

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=300761&r1=300760&r2=300761
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jan  5 19:41:57 2011
@@ -557,7 +557,7 @@
 	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk -a ! -f /sbin/launchd ]; then \
-		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe.tmp ; \
+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;s|__ASTERISK_LOG_DIR__|$(ASTLOGDIR)|;' > contrib/scripts/safe.tmp ; \
 		$(INSTALL) -m 755 contrib/scripts/safe.tmp $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ; \
 		rm -f contrib/scripts/safe.tmp ; \
 	fi

Modified: trunk/contrib/scripts/safe_asterisk
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/safe_asterisk?view=diff&rev=300761&r1=300760&r2=300761
==============================================================================
--- trunk/contrib/scripts/safe_asterisk (original)
+++ trunk/contrib/scripts/safe_asterisk Wed Jan  5 19:41:57 2011
@@ -1,18 +1,20 @@
 #!/bin/sh
 # vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
 
-CLIARGS="$*"				# Grab any args passed to safe_asterisk
+ASTSBINDIR=__ASTERISK_SBIN_DIR__
+ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
+ASTVARLOGDIR=__ASTERISK_LOG_DIR__
+
+CLIARGS="$*"					# Grab any args passed to safe_asterisk
 TTY=9						# TTY (if you want one) for Asterisk to run on
 CONSOLE=yes					# Whether or not you want a console
-#NOTIFY=ben at alkaloid.net	# Who to notify about crashes
-#EXEC=/path/to/somescript	# Run this command if Asterisk crashes
-#LOGFILE=/path/to/logfile	# Where to place the normal logfile (disabled if blank)
-#SYSLOG=local0				# Which syslog facility to use (disabled if blank)
-MACHINE=`hostname`			# To specify which machine has crashed when getting the mail
+#NOTIFY=root at localhost.localdomain		# Who to notify about crashes
+#EXEC=/path/to/somescript			# Run this command if Asterisk crashes
+#LOGFILE=${ASTVARLOGDIR}/safe_asterisk.log	# Where to place the normal logfile (disabled if blank)
+#SYSLOG=local0					# Which syslog facility to use (disabled if blank)
+MACHINE=`hostname`				# To specify which machine has crashed when getting the mail
 DUMPDROP=/tmp
 SLEEPSECS=4
-ASTSBINDIR=__ASTERISK_SBIN_DIR__
-ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
 ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
 
 # comment this line out to have this script _not_ kill all mpg123 processes when