Index: contrib/init.d/rc.redhat.asterisk =================================================================== --- contrib/init.d/rc.redhat.asterisk (revision 211674) +++ contrib/init.d/rc.redhat.asterisk (working copy) @@ -3,7 +3,7 @@ # # asterisk Starts, Stops and Reloads Asterisk. # -# chkconfig: 2345 90 60 +# chkconfig: - 90 60 # description: Asterisk PBX and telephony daemon. # processname: asterisk # pidfile: /var/run/asterisk.pid @@ -18,53 +18,58 @@ # - Added test for safe_asterisk # - Verified SIGTERM issued by "killproc" ensures "stop gracefully" # - Added support for -U and -G command line options -# - Modified "reload" to call asterisk -rx 'reload' +# - Modified "reload" to call asterisk -rx 'reload' -# Use this option to specify a different configuration directory -#AST_CONFIG=/etc/asterisk +# Do not modify this script to change any of the settings, instead +# edit /etc/sysconfig/asterisk +# Specify the configuration file +AST_CONFIG=/etc/asterisk/asterisk.conf + # Installation directory AST_SBIN=/usr/sbin # Uncomment the following and set them to the user/groups that you # want to run Asterisk as. NOTE: this requires substantial work to # be sure that Asterisk's environment has permission to write the -# files required for its operation, including logs, its comm +# files required for its operation, including logs. # socket, the asterisk database, etc. +# The user that Asterisk will run as. #AST_USER="asterisk" + +# If a user is specified above, Asterisk will change the group it runs +# as to the primary group of the user, as well as initialize the +# supplementary groups. If you want to run Asterisk as a different +# group, set AST_GROUP to the group that Asterisk should run as. Note +# that this may break Zaptel devices as supplementary groups will not +# be initialized. #AST_GROUP="asterisk" -# Source function library. -. /etc/rc.d/init.d/functions +# Allow configuration overrides in /etc/sysconfig/asterisk +CONFIG0=`readlink $0` +if [ "$CONFIG0" = "" ]; then + CONFIGFILE=/etc/sysconfig/`basename $0` +else + CONFIGFILE=/etc/sysconfig/`basename $CONFIG0` +fi +[ -f $CONFIGFILE ] && . $CONFIGFILE if ! [ -x $AST_SBIN/asterisk ] ; then echo "ERROR: $AST_SBIN/asterisk not found" exit 0 fi -if ! [ -d $AST_CONFIG ] ; then - echo "ERROR: $AST_CONFIG directory not found" +if ! [ -f $AST_CONFIG ] ; then + echo "ERROR: $AST_CONFIG not found" exit 0 fi -# Uncomment this ONLY if you know what you are doing. -# export LD_ASSUME_KERNEL=2.4.1 +# Source function library. +. /etc/rc.d/init.d/functions # Full path to asterisk binary DAEMON=$AST_SBIN/asterisk -# Full path to safe_asterisk script -SAFE_ASTERISK=$AST_SBIN/safe_asterisk - -# Allow configuration overrides in /etc/sysconfig/asterisk -CONFIG0=`readlink $0` -if [ "$CONFIG0" = "" ]; then - CONFIGFILE=/etc/sysconfig/`basename $0` -else - CONFIGFILE=/etc/sysconfig/`basename $CONFIG0` -fi -[ -x $CONFIGFILE ] && . $CONFIGFILE - RETVAL=0 start() { @@ -78,9 +83,6 @@ # Start daemons. echo -n $"Starting asterisk: " - if [ -f $SAFE_ASTERISK ] ; then - DAEMON=$SAFE_ASTERISK - fi if [ $AST_USER ] ; then ASTARGS="-U $AST_USER" fi @@ -88,7 +90,7 @@ ASTARGS="$ASTARGS -G $AST_GROUP" fi if [ $AST_CONFIG ]; then - ASTARGS="$ASTARGS -C $AST_CONFIG/asterisk.conf" + ASTARGS="$ASTARGS -C $AST_CONFIG" fi daemon $DAEMON $ASTARGS RETVAL=$? @@ -99,7 +101,7 @@ stop() { # Stop daemons. - echo -n $"Shutting down asterisk: " + echo -n $"Stopping asterisk: " killproc asterisk RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk Index: contrib/sysconfig/asterisk =================================================================== --- contrib/sysconfig/asterisk (revision 0) +++ contrib/sysconfig/asterisk (revision 0) @@ -0,0 +1,16 @@ +# Specify the configuration file +AST_CONFIG=/etc/asterisk/asterisk.conf + +# Installation directory +AST_SBIN=/usr/sbin + +# The user that Asterisk will run as. +AST_USER="asterisk" + +# If a user is specified above, Asterisk will change the group it runs +# as to the primary group of the user, as well as initialize the +# supplementary groups. If you want to run Asterisk as a different +# group, set AST_GROUP to the group that Asterisk should run as. Note +# that this may break Zaptel devices as supplementary groups will not +# be initialized. +#AST_GROUP="asterisk"