[Pkg-voip-commits] r3226 - in freepbx/trunk/debian: astetc patches
share
Diego Iastrubni
elcuco-guest at alioth.debian.org
Tue Mar 13 14:28:32 CET 2007
Author: elcuco-guest
Date: 2007-03-13 13:28:31 +0000 (Tue, 13 Mar 2007)
New Revision: 3226
Added:
freepbx/trunk/debian/astetc/logger.conf
freepbx/trunk/debian/patches/fix-ari-link.dpatch
Removed:
freepbx/trunk/debian/astetc/musiconhold_custom.conf.sample
freepbx/trunk/debian/patches/fix-recordings.dpatch
Modified:
freepbx/trunk/debian/astetc/asterisk.conf
freepbx/trunk/debian/patches/00list
freepbx/trunk/debian/share/update-freepbx
Log:
* fix-recordings.dpatch can be removed completely
* musicon_hold_custom.conf.sample is obsolete
* asterisk.conf: ported an option from upstream's configuration
* update-freepbx is less verbose now (sed -n). THIS SHOULD BE A VERY QUIET SCRIPT!
* logger.conf new defaults: no full log, and show to the console only errors. no body needs that much logs.
* show ari on the menu when installed, fix-ari-link.dpath
Modified: freepbx/trunk/debian/astetc/asterisk.conf
===================================================================
--- freepbx/trunk/debian/astetc/asterisk.conf 2007-03-11 15:32:09 UTC (rev 3225)
+++ freepbx/trunk/debian/astetc/asterisk.conf 2007-03-13 13:28:31 UTC (rev 3226)
@@ -14,3 +14,6 @@
astctlowner = asterisk
astctlgroup = asterisk
astctl = asterisk.ctl
+
+[options]
+transmit_silence_during_record = yes
Added: freepbx/trunk/debian/astetc/logger.conf
===================================================================
--- freepbx/trunk/debian/astetc/logger.conf 2007-03-11 15:32:09 UTC (rev 3225)
+++ freepbx/trunk/debian/astetc/logger.conf 2007-03-13 13:28:31 UTC (rev 3226)
@@ -0,0 +1,37 @@
+;
+; Logging Configuration
+;
+; In this file, you configure logging to files or to
+; the syslog system.
+;
+; For each file, specify what to log.
+;
+; For console logging, you set options at start of
+; Asterisk with -v for verbose and -d for debug
+; See 'asterisk -h' for more information.
+;
+; Directory for log files is configures in asterisk.conf
+; option astlogdir
+;
+[logfiles]
+;
+; Format is "filename" and then "levels" of debugging to be included:
+; debug
+; notice
+; warning
+; error
+; verbose
+;
+; Special filename "console" represents the system console
+;
+;debug => debug
+;console => notice,warning,error
+;console => notice,warning,error,debug
+;messages => notice,warning,error
+;full => notice,warning,error,debug,verbose
+console => error
+
+;syslog keyword : This special keyword logs to syslog facility
+;
+;syslog.local0 => notice,warning,error
+;
Deleted: freepbx/trunk/debian/astetc/musiconhold_custom.conf.sample
===================================================================
--- freepbx/trunk/debian/astetc/musiconhold_custom.conf.sample 2007-03-11 15:32:09 UTC (rev 3225)
+++ freepbx/trunk/debian/astetc/musiconhold_custom.conf.sample 2007-03-13 13:28:31 UTC (rev 3226)
@@ -1,27 +0,0 @@
-;;
-;; adding music on hold mannually:
-;;
-;; please note that while this does work, this is the wrong way of doing this
-;;
-;;
-;; TS-1 users notice:
-;; at the start of this procudure, you need to exec the command: "mountrw"
-;; and at the end, the command "fh-sync"
-;;
-;;
-;; 1) mkdir /usr/share/asterisk/mohmp3/sting
-;; 2) cp /etc/asterisk/musiconhold_custom.conf.sample /etc/asterisk/musiconhold_custom.conf
-;; 3) uncomment the following line from the new custom configuration
-;; class1 => custom:/usr/share/asterisk/mohmp3/class1,/usr/bin/ast-cmd wav-player
-;; 4) now you may add file wav files to /usr/share/asterisk/mohmp3/class1
-;; 5) the files must be properly encoded wav files, named *.mp3. yes, the wavs must end
-;; with mp3 extension. This is because asterisk 1.0 looks for *.mp3.
-;;
-;; The way I so this is:
-;; sox file1.wav -c1 -t wav -r 8000 -t wav file1-8khz.wav resample -q
-;; ln -s file1-8khz.wav file1-8khz.wav.mp3
-
-;; You can do this for any ammount of classes, at least until you ran out of disk
-;; space ;-)
-;;
-;; Diego Iastrubni <diego.iastrubni at xorcom.com>
Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list 2007-03-11 15:32:09 UTC (rev 3225)
+++ freepbx/trunk/debian/patches/00list 2007-03-13 13:28:31 UTC (rev 3226)
@@ -8,6 +8,7 @@
disable-online-updates
clean-install-amp
fix-agibin-dir
+fix-ari-link
# integration with debian's op-panel
fix-fop-config.dpatch
Added: freepbx/trunk/debian/patches/fix-ari-link.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-ari-link.dpatch 2007-03-11 15:32:09 UTC (rev 3225)
+++ freepbx/trunk/debian/patches/fix-ari-link.dpatch 2007-03-13 13:28:31 UTC (rev 3226)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-ari-link.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad upstream~/amp_conf/htdocs/admin/header.php upstream/amp_conf/htdocs/admin/header.php
+--- upstream~/amp_conf/htdocs/admin/header.php 2006-12-09 01:48:17.000000000 +0200
++++ upstream/amp_conf/htdocs/admin/header.php 2007-03-13 15:14:36.000000000 +0200
+@@ -136,7 +136,7 @@
+ print_sub_tool( _("Tools") , "config.php" , $currentFile=='config.php' && isset($_REQUEST['type']) && $_REQUEST['type']=='tool' , "config.php?type=tool", false );
+ print_sub_tool( _("Reports") , "reports.php", $currentFile=='reports.php' );
+ print_sub_tool( _("Panel") , "panel.php" , $currentFile=='panel.php' );
+- print_sub_tool( _("Recordings"), "../recordings/index.php" ,0, NULL, true );
++ print_sub_tool( _("Recordings"), "../ari/index.php" ,0, NULL, true );
+ echo "\t\t</ul>\n";
+
+ $freepbx_alt = _("freePBX");
Property changes on: freepbx/trunk/debian/patches/fix-ari-link.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: freepbx/trunk/debian/patches/fix-recordings.dpatch
===================================================================
Modified: freepbx/trunk/debian/share/update-freepbx
===================================================================
--- freepbx/trunk/debian/share/update-freepbx 2007-03-11 15:32:09 UTC (rev 3225)
+++ freepbx/trunk/debian/share/update-freepbx 2007-03-13 13:28:31 UTC (rev 3226)
@@ -64,9 +64,9 @@
# if no address supplied in amportal.conf, get it from eth0. We must have a valid IP
# for sending emails no?
if [ "x$AMPWEBADDRESS" == "x" ]; then
- WEBADDRESS=`/sbin/ifconfig eth0 | grep 'inet addr:' | sed 's/addr://' | awk '{ print $2 }'`
+ 24~WEBADDRESS=`/sbin/ifconfig eth0 | grep 'inet addr:' | sed 's/addr://' | awk '{ print $2 }'`
else
- WEBADDRESS=$AMPWEBADDRESS
+ WEBADDRESS=$AMPWEBADDRESS
fi
echo " - Updating /etc/asterisk/vm_email.inc (may require manual check)..."
sed -i -e "s|http://[\\w\\d]*/|http://$WEBADDRESS/|g" /etc/asterisk/vm_email.inc
@@ -74,12 +74,12 @@
if [ -e /etc/op-panel/freepbx/op_server.cfg ] ; then
echo -n " - Updating op-panel"
- sed -r -i "s/manager_user=[a-zA-Z0-9]*/manager_user=$AMPMGRUSER/" /etc/op-panel/freepbx/op_server.cfg
- sed -r -i "s/manager_secret=[a-zA-Z0-9]*/manager_secret=$AMPMGRPASS/" /etc/op-panel/freepbx/op_server.cfg
- sed -r -i "s/web_hostname=[a-zA-Z0-9_.-]*/web_hostname=$AMPWEBADDRESS/" /etc/op-panel/freepbx/op_server.cfg
- sed -r -i "s/security_code=[a-zA-Z0-9]*/security_code=$FOPPASSWORD/" /etc/op-panel/freepbx/op_server.cfg
- sed -r -i "s!flash_dir=[a-zA-Z0-9_./\-]*!flash_dir=$AMPWEBROOT\/panel!" /etc/op-panel/freepbx/op_server.cfg
- sed -r -i "s!web_hostname=[a-zA-Z0-9.]*!web_hostname=$AMPWEBADDRESS!" /etc/op-panel/freepbx/op_server.cfg
+ sed -n -r -i "s/manager_user=[a-zA-Z0-9]*/manager_user=$AMPMGRUSER/" /etc/op-panel/freepbx/op_server.cfg
+ sed -n -r -i "s/manager_secret=[a-zA-Z0-9]*/manager_secret=$AMPMGRPASS/" /etc/op-panel/freepbx/op_server.cfg
+ sed -n -r -i "s/web_hostname=[a-zA-Z0-9_.-]*/web_hostname=$AMPWEBADDRESS/" /etc/op-panel/freepbx/op_server.cfg
+ sed -n -r -i "s/security_code=[a-zA-Z0-9]*/security_code=$FOPPASSWORD/" /etc/op-panel/freepbx/op_server.cfg
+ sed -n -r -i "s!flash_dir=[a-zA-Z0-9_./\-]*!flash_dir=/usr/share/op-panel/flash!" /etc/op-panel/freepbx/op_server.cfg
+ sed -n -r -i "s!web_hostname=[a-zA-Z0-9.]*!web_hostname=$AMPWEBADDRESS!" /etc/op-panel/freepbx/op_server.cfg
echo "."
# we might find situations in which there is no file operator panel installed
More information about the Pkg-voip-commits
mailing list