[asterisk-commits] mjordan: trunk r397939 - in /trunk: ./ configs/ contrib/scripts/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Aug 29 15:22:10 CDT 2013
Author: mjordan
Date: Thu Aug 29 15:22:08 2013
New Revision: 397939
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397939
Log:
Revert r394939 due to (numerous) objections
The patch from ASTERISK-21965 was committed perhaps a bit too hastily. Walter
and Tzafrir have pointed out numerous issues with the approach and have
propsed an alternative in r/2757. Since it's not a time critical issue and
is not worth holding up the release of 12 for it, I've gone ahead and reverted
r394939 from 12/trunk and re-opened ASTERISK-21965.
........
Merged revisions 397938 from http://svn.asterisk.org/svn/asterisk/branches/12
Removed:
trunk/configs/safe_asterisk.conf.sample
Modified:
trunk/ (props changed)
trunk/CHANGES
trunk/Makefile
trunk/contrib/scripts/safe_asterisk
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Thu Aug 29 15:22:08 2013
@@ -1,1 +1,1 @@
-/branches/12:1-397927
+/branches/12:1-397927,397938
Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=397939&r1=397938&r2=397939
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Thu Aug 29 15:22:08 2013
@@ -1102,21 +1102,11 @@
------------------
* Asterisk previously included example db schemas in the contrib/realtime/
directory of the source tree. This has been replaced by a set of database
- migrations using the Alembic framework. This allows you to use alembic to
+ migrations using the Alembic framework. This allows you to use alembic to
initialize the database for you. It will also serve as a database migration
tool when upgrading Asterisk in the future.
See contrib/ast-db-manage/README.md for more details.
-
-safe_asterisk
-------------------
- * The safe_asterisk script will now install over previously installations.
- In previous versions of Asterisk, once installed a 'make install' would
- skip over safe_asterisk if it was already installed.
-
- * Certain options in safe_asterisk can now be configured from the
- safe_asterisk.conf file. A sample version of this is located in the
- configs/ folder.
sip_to_res_pjsip.py
-------------------
Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=397939&r1=397938&r2=397939
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Aug 29 15:22:08 2013
@@ -561,8 +561,8 @@
bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
$(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
- if [ ! -f /sbin/launchd ]; then \
- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;s|__ASTERISK_LOG_DIR__|$(ASTLOGDIR)|;s|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;' > contrib/scripts/safe.tmp ; \
+ 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)|;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=397939&r1=397938&r2=397939
==============================================================================
--- trunk/contrib/scripts/safe_asterisk (original)
+++ trunk/contrib/scripts/safe_asterisk Thu Aug 29 15:22:08 2013
@@ -1,7 +1,6 @@
#!/bin/sh
# vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
-ASTETCDIR=__ASTERISK_ETC_DIR__
ASTSBINDIR=__ASTERISK_SBIN_DIR__
ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
ASTVARLOGDIR=__ASTERISK_LOG_DIR__
@@ -20,32 +19,23 @@
SLEEPSECS=4
ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
-# Obtain parameters from the safe_asterisk.conf file in the
-# ASTETCDIR directory
-
-kvalue=`grep ^KILLALLMPG123= $ASTETCDIR 2>/dev/null | cut -c 15`
-if test "x$kvalue" != "x" ; then
- KILLALLMPG123=$kvalue
-else
- KILLALLMPG123=0
-fi
-
-pvalue=`grep ^PRIORITY= $ASTETCDIR 2>/dev/null | cut -c 10`
-if test "x$pvalue" != "x" ; then
- PRIORITY=$pvalue
-else
- PRIORITY=0
-fi
-
-svalue=`grep ^SYSMAXFILES= $ASTETCDIR 2>/dev/null | cut -c 13-21`
-if test "x$svalue" != "x" ; then
- SYSMAXFILES=$svalue
-fi
-
-mvalue=`grep ^MAXFILES= $ASTETCDIR 2>/dev/null | cut -c 10-15`
-if test "x$mvalue" != "x" ; then
- MAXFILES=$mvalue
-fi
+# comment this line out to have this script _not_ kill all mpg123 processes when
+# asterisk exits
+KILLALLMPG123=1
+
+# run asterisk with this priority
+PRIORITY=0
+
+# set system filemax on supported OSes if this variable is set
+# SYSMAXFILES=262144
+
+# Asterisk allows full permissions by default, so set a umask, if you want
+# restricted permissions.
+#UMASK=022
+
+# set max files open with ulimit. On linux systems, this will be automatically
+# set to the system's maximum files open devided by two, if not set here.
+# MAXFILES=32768
message() {
echo "$1" >&2
@@ -106,10 +96,8 @@
fi
-
-uvalue=`grep ^UMASK= $ASTETCDIR 2>/dev/null | cut -c 7-10`
-if test "x$uvalue" != "x" ; then
- umask $uvalue
+if test "x$UMASK" != "x"; then
+ umask $UMASK
fi
#
@@ -145,7 +133,7 @@
fi
fi
-if test ! -w "${DUMPDROP}" ; then
+if test ! -w "${DUMPDROP}" ; then
message "Cannot write to ${DUMPDROP}"
exit 1
fi
@@ -169,7 +157,7 @@
run_asterisk()
{
- while :; do
+ while :; do
if test "x$TTY" != "x" ; then
cd "${RUNDIR}"
More information about the asterisk-commits
mailing list