automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@21678 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk
index 2cfab55dae670fb3fd06a67a0619757a57f2f402..5a8808a56f658799563864e04ce80f04b9f9e55d 100644 (file)
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
@@ -34,9 +34,17 @@ fi
 #
 ulimit -c unlimited
 
-#launch_asterisk()
-#{
-#}
+#
+# Run scripts to set any environment variables or do any other system-specific setup needed
+#
+
+if [ -d /etc/asterisk/startup.d ]; then
+       for script in /etc/asterisk/startup.d/*.sh; do
+               if [ -x ${script} ]; then
+                       source ${script}
+               fi
+       done
+fi
 
 run_asterisk()
 {

diff --git a/contrib/scripts/safe_asterisk.8 b/contrib/scripts/safe_asterisk.8
index 277fa5f8dc4e6292722327bc6c264d9c74d479c2..ebd95142abe27a56d2fa2ba3832419a55b09b7bf 100644 (file)
--- a/contrib/scripts/safe_asterisk.8
+++ b/contrib/scripts/safe_asterisk.8
@@ -40,6 +40,13 @@ safe_asterisk runs in that directory, rather than in / as usual.
 If core files were generated there, they may be 
 .RE
 
+.B /etc/asterisk/startup.d
+.RS
+Files in this directory will be 'source'd by the safe_asterisk script before
+it starts Asterisk proper, allowing them to set additional environment variables
+or run any other steps that are needed for your system.
+.RE
+
 .SH BUGS
 While showing the output on a console is useful, using screen(1) as 
 the terminal may be better.