diff --git a/Makefile b/Makefile index 193b0be0b629272926b4b3000f554f961b322ad6..00c68454c739ada96f326484bbe0a491a27efe01 100644 --- a/Makefile +++ b/Makefile @@ -557,7 +557,7 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) $(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 diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index 96333e4a896460ea23c1596a244d1190573a3b20..61290906bb9f7f32292d1e70287b9263c61c75c2 100644 --- a/contrib/scripts/safe_asterisk +++ b/contrib/scripts/safe_asterisk @@ -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@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@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