[Pkg-voip-commits] r3170 - in asterisk/trunk/debian: . ast_config
Tzafrir Cohen
tzafrir-guest at alioth.debian.org
Thu Feb 22 13:28:33 CET 2007
Author: tzafrir-guest
Date: 2007-02-22 13:28:33 +0100 (Thu, 22 Feb 2007)
New Revision: 3170
Added:
asterisk/trunk/debian/TODO.Debian
asterisk/trunk/debian/ast_config/manager.d/
asterisk/trunk/debian/stereorize.1
Modified:
asterisk/trunk/debian/ast_config/asterisk.conf
asterisk/trunk/debian/asterisk.init
asterisk/trunk/debian/changelog
asterisk/trunk/debian/rules
Log:
* Use asterisk.conf based on README.asterisk.conf:
- Set default user to asterisk.
- Make the control socket writabe by the group asterisk.
* don't remove stereorize and streamplayer.
* A man page for stereorize.
* Create /etc/asterisk/manager.d (Closes: #410715).
* Check that Asterisk is alive before sending a command (Closes: #389488).
* Use MAKEBUILDOPTS instead of MAKEFLAGS, which is a reserved gmake name.
Added: asterisk/trunk/debian/TODO.Debian
===================================================================
--- asterisk/trunk/debian/TODO.Debian 2007-02-20 17:58:52 UTC (rev 3169)
+++ asterisk/trunk/debian/TODO.Debian 2007-02-22 12:28:33 UTC (rev 3170)
@@ -0,0 +1,7 @@
+* Asterisk 1.4 (see the experimental branch for the moemnt)
+* If we set the asterisk user in asterisk.con, the check for a user in the
+ init.d script is unnecessary?
+* Is there any problem with having the [general] section in the common
+ indications.conf ?
+
+$ID$
Property changes on: asterisk/trunk/debian/TODO.Debian
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Modified: asterisk/trunk/debian/ast_config/asterisk.conf
===================================================================
--- asterisk/trunk/debian/ast_config/asterisk.conf 2007-02-20 17:58:52 UTC (rev 3169)
+++ asterisk/trunk/debian/ast_config/asterisk.conf 2007-02-22 12:28:33 UTC (rev 3170)
@@ -1,8 +1,67 @@
-[global]
+[directories]
+; Make sure these directoriess have the right permissions if not
+; running Asterisk as root
+
+; Where the configuration files (except for this one) are located
astetcdir => /etc/asterisk
+
+; Where the Asterisk loadable modules are located
astmoddir => /usr/lib/asterisk/modules
+
+; Where additional 'library' elements (scripts, etc.) are located
astvarlibdir => /var/lib/asterisk
+
+; Where AGI scripts/programs are located
astagidir => /usr/share/asterisk/agi-bin
+
+; Where spool directories are located
+; Voicemail, monitor, dictation and other apps will create files here
+; and outgoing call files (used with pbx_spool) must be placed here
astspooldir => /var/spool/asterisk
+
+; Where the Asterisk process ID (pid) file should be created
astrundir => /var/run/asterisk
+
+; Where the Asterisk log files should be created
astlogdir => /var/log/asterisk
+
+
+[options]
+;Under "options" you can enter configuration options
+;that you also can set with command line options
+
+;verbose = 0 ; Verbosity level for logging (-v)
+;debug = 3 ; Debug: "No" or value (1-4)
+;nofork=yes | no ; Background execution disabled (-f)
+;console= yes | no ; Console mode (-c)
+;highpriority = yes | no ; Execute with high priority (-p)
+;initcrypto = yes | no ; Initialize crypto at startup (-i)
+;nocolor = yes | no ; Disable ANSI colors (-n)
+;dumpcore = yes | no ; Dump core on failure (-g)
+;quiet = yes | no ; Run quietly (-q)
+;timestamp = yes | no ; Force timestamping on log entries to console (-T)
+runuser = asterisk ; User to run asterisk as (-U) NOTE: will require changes to
+ ; directory and device permisions
+;rungroup = asterisk ; Group to run asterisk as (-G)
+
+;These options have no command line equivalent
+;cache_record_files = yes | no ; Cache record() files in another directory until completion
+;record_cache_dir = <dir>
+;transcode_via_sln = yes | no ; Build transcode paths via SLINEAR
+;transmit_silence_during_record = yes | no ; send SLINEAR silence while channel is being recorded
+;maxload = 1.0 ; The maximum load average we accept calls for
+;maxcalls = 255 ; The maximum number of concurrent calls you want to allow
+;execincludes = yes | no ; Allow #exec entries in configuration files
+;dontwarn = yes | no ; Don't over-inform the Asterisk sysadm, he's a guru
+
+[files]
+; Changing the following lines may compromise your security
+; Asterisk.ctl is the pipe that is used to connect the remote CLI
+; (asterisk -r) to Asterisk. Changing these settings change the
+; permissions and ownership of this file.
+; The file is created when Asterisk starts, in the "astrundir" above.
+
+astctlpermissions = 0660
+astctlowner = root
+astctlgroup = asterisk
+astctl = asterisk.ctl
Modified: asterisk/trunk/debian/asterisk.init
===================================================================
--- asterisk/trunk/debian/asterisk.init 2007-02-20 17:58:52 UTC (rev 3169)
+++ asterisk/trunk/debian/asterisk.init 2007-02-22 12:28:33 UTC (rev 3170)
@@ -80,6 +80,11 @@
fi
}
+asterisk_rx() {
+ if ! status >/dev/null; then return 0; fi
+ $DAEMON -rx "$1"
+}
+
case "$1" in
debug)
# we add too many special parameters that I don't want to skip
@@ -141,14 +146,14 @@
;;
reload)
echo "Reloading $DESC configuration files."
- $DAEMON -rx 'reload' || true
+ asterisk_rx 'reload'
;;
logger-reload)
- $DAEMON -rx 'logger reload' || true
+ asterisk_rx 'logger reload'
;;
extensions-reload)
echo "Reloading $DESC configuration files."
- $DAEMON -rx 'extensions reload' || true
+ asterisk_rx 'extensions reload'
;;
restart|force-reload)
$0 stop
Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog 2007-02-20 17:58:52 UTC (rev 3169)
+++ asterisk/trunk/debian/changelog 2007-02-22 12:28:33 UTC (rev 3170)
@@ -5,8 +5,16 @@
* bristuff.dpatch: adapted to chan_conf.
* daemon_color.dpatch: make rastrisk colourful even without safe_asterisk.
* No need to edit a config file to start Asterisk.
+ * Use asterisk.conf based on README.asterisk.conf:
+ - Set default user to asterisk.
+ - Make the control socket writabe by the group asterisk.
+ * don't remove stereorize and streamplayer.
+ * A man page for stereorize.
+ * Create /etc/asterisk/manager.d (Closes: #410715).
+ * Check that Asterisk is alive before sending a command (Closes: #389488).
+ * Use MAKEBUILDOPTS instead of MAKEFLAGS, which is a reserved gmake name.
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Tue, 13 Feb 2007 18:54:26 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Thu, 22 Feb 2007 14:22:00 +0200
asterisk (1:1.2.14~dfsg-5) UNRELEASED; urgency=low
Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules 2007-02-20 17:58:52 UTC (rev 3169)
+++ asterisk/trunk/debian/rules 2007-02-22 12:28:33 UTC (rev 3170)
@@ -19,7 +19,7 @@
export PROC := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-MAKEFLAGS = OPTIMIZE=-O2 MAKECMDGOALS=dont-optimize
+MAKEBUILDOPTS = OPTIMIZE=-O2 MAKECMDGOALS=dont-optimize
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -89,9 +89,9 @@
dh_testdir
# Add here command to compile/build the package.
- $(MAKE) $(MAKEFLAGS)
- $(MAKE) $(MAKEFLAGS) -C channels/h323 opt
- $(MAKE) $(MAKEFLAGS) -C $(BRISTUFF_DIR)
+ $(MAKE) $(MAKEBUILDOPTS)
+ $(MAKE) $(MAKEBUILDOPTS) -C channels/h323 opt
+ $(MAKE) $(MAKEBUILDOPTS) -C $(BRISTUFF_DIR)
touch $@
@@ -151,7 +151,6 @@
mkdir -p $(CURDIR)/debian/tmp/usr/lib/cgi-bin/asterisk/
cp contrib/scripts/vmail.cgi $(CURDIR)/debian/tmp/usr/lib/cgi-bin/asterisk/
chmod +x $(CURDIR)/debian/tmp/usr/lib/cgi-bin/asterisk/vmail.cgi
- $(RM) -f $(CURDIR)/debian/tmp/usr/sbin/{stereorize,streamplayer}
# override some default configurations. Leave the original ones
# in the sample configs:
cp -a debian/ast_config/* $(CURDIR)/debian/tmp/etc/asterisk
@@ -164,9 +163,6 @@
# bristuff
$(MAKE) -C $(BRISTUFF_DIR) DESTDIR=$(CURDIR)/debian/tmp/bristuff install
- mkdir -p $(CURDIR)/debian/tmp/bristuff/etc/default/
- cp debian/asterisk.default $(CURDIR)/debian/tmp/bristuff/etc/default/asterisk
- $(RM) -f $(CURDIR)/debian/tmp/bristuff/usr/sbin/{stereorize,streamplayer}
dh_install --sourcedir=debian/tmp
install -m 644 include/asterisk.h $(CURDIR)/debian/asterisk-dev/usr/include/asterisk.h
Added: asterisk/trunk/debian/stereorize.1
===================================================================
--- asterisk/trunk/debian/stereorize.1 2007-02-20 17:58:52 UTC (rev 3169)
+++ asterisk/trunk/debian/stereorize.1 2007-02-22 12:28:33 UTC (rev 3170)
@@ -0,0 +1,69 @@
+.TH STEREORIZE 1 "FEB 21th, 2007" "stereorize" "Linux Administratos's Manual"
+.SH NAME
+.B stereorize
+-- convert two mono wav files to one stereo wav file.
+.SH SYNOPSIS
+.PP
+.B stereorize
+.I left.wav right.wav stereo.wav
+
+.SH DESCRIPTION
+.B stereorize
+is a command-line unility to merge to mono WAV files to one stereo file.
+
+.SH OPTIONS
+
+.I -h
+.RS
+create a WAV-header on output files.
+.RE
+
+.I -c#
+.RS
+set number of channels to # (1 or 2). Default: like input.
+.RE
+
+.I-w#
+.RS
+set number of bits per sample (width) to # (only 16)
+.RE
+
+.I -f#
+.RS
+set sample frequency to #. Default: like input.
+.RE
+
+.I -V
+.RS
+verbose: talk a lot.
+.RE
+
+.I -Q
+.RS
+quiet: talk as little as possible.
+.RE
+
+.I --help
+.RS
+Just print usage message and exit.
+.RE
+
+.SH NOTES
+TODO: Add a proper sox command-line to do the sma or better.
+
+.SH "SEE ALSO"
+asterisk(8), sox(1)
+
+http://www.voip-info.org/wiki-Asterisk+astman
+
+.SH BUGS
+Report to http://bugs.digium.com/
+
+.SH "AUTHOR"
+This manual page was written by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Permission is granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 or any
+later version published by the Free Software Foundation.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
More information about the Pkg-voip-commits
mailing list