[Pkg-voip-commits] r3432 - in
freepbx/modules-2.2/modules/freepbx-module-zapauto: . debian
debian/patches share
Diego Iastrubni
elcuco-guest at alioth.debian.org
Wed Apr 18 13:44:50 UTC 2007
Author: elcuco-guest
Date: 2007-04-18 13:44:49 +0000 (Wed, 18 Apr 2007)
New Revision: 3432
Added:
freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/
freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/00list
freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/run-scripts-as-www-data.dpatch
Modified:
freepbx/modules-2.2/modules/freepbx-module-zapauto/README
freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/changelog
freepbx/modules-2.2/modules/freepbx-module-zapauto/freepbx-module-zapauto.spec
freepbx/modules-2.2/modules/freepbx-module-zapauto/module.xml
freepbx/modules-2.2/modules/freepbx-module-zapauto/page.zapauto.php
freepbx/modules-2.2/modules/freepbx-module-zapauto/share/detect_zap
freepbx/modules-2.2/modules/freepbx-module-zapauto/share/zap2amp
freepbx/modules-2.2/modules/freepbx-module-zapauto/zap_auto_ask.php
freepbx/modules-2.2/modules/freepbx-module-zapauto/zap_auto_detect.php
Log:
* the gui will be displayed in different colors, and will keep red if an error has happend
* updated version on xml
* zap2amp is less verbose (pointed out which freepbx it's using, old debug code i forgot to remove)
* README udpated, all files now should say 2007 as well
* detect_zap restarts asterisk + zaptel only once (I hope, needs more tests)
Modified: freepbx/modules-2.2/modules/freepbx-module-zapauto/README
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/README 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/README 2007-04-18 13:44:49 UTC (rev 3432)
@@ -27,7 +27,7 @@
and that the version of genzaptelconf found in Trixbox (/usr/local/sbin/genzaptelconf)
is not suitable for this utility.
-This version is only for freepbx-2.2.x, and not all other versions.
+This version is should work in FreePBX 2.1.X and 2.2.X. If you find a problem, please contact us.
How it works
------------
Modified: freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/changelog 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/changelog 2007-04-18 13:44:49 UTC (rev 3432)
@@ -1,3 +1,15 @@
+freepbx-module-zapauto (2.2-0.6.4-1) unstable; urgency=low
+
+ * Restart of asterisk + zaptel is done only once
+ * Scripts are been run as "www-data" and not "asterisk"
+ * Script will change colors:
+ - blue means running
+ - green means ended ok
+ - red means ended with a problem
+ * Updated freePBX configuration to reflect new version (forgotten in last update)
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Wed, 18 Apr 2007 16:08:01 +0300
+
freepbx-module-zapauto (2.2-0.6.3-1) unstable; urgency=low
* Code supports freePBX 2.1 and 2.2
Added: freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/00list
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/00list 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/00list 2007-04-18 13:44:49 UTC (rev 3432)
@@ -0,0 +1 @@
+run-scripts-as-www-data
Added: freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/run-scripts-as-www-data.dpatch
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/run-scripts-as-www-data.dpatch 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/run-scripts-as-www-data.dpatch 2007-04-18 13:44:49 UTC (rev 3432)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## run-scripts-as-www-data.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## DP: The scripts should be run with same context as "freepbx", this is
+## DP: not "asterisk" but "www-data"
+
+ at DPATCH@
+diff -urNad freepbx-module-zapauto~/share/detect_zap freepbx-module-zapauto/share/detect_zap
+--- freepbx-module-zapauto~/share/detect_zap 2007-04-18 15:56:10.000000000 +0300
++++ freepbx-module-zapauto/share/detect_zap 2007-04-18 15:57:14.000000000 +0300
+@@ -54,8 +54,8 @@
+
+ set -e
+
+-AST_USER=asterisk
+-AST_GROUP=asterisk
++AST_USER=www-data
++AST_GROUP=www-data
+ AST_SHELL=/bin/sh
+
+ # find new HW, asterisk will be running after it, as zap2amp
Property changes on: freepbx/modules-2.2/modules/freepbx-module-zapauto/debian/patches/run-scripts-as-www-data.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: freepbx/modules-2.2/modules/freepbx-module-zapauto/freepbx-module-zapauto.spec
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/freepbx-module-zapauto.spec 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/freepbx-module-zapauto.spec 2007-04-18 13:44:49 UTC (rev 3432)
@@ -1,6 +1,6 @@
Summary: FreePBX module - Zaptel AutoConfiguration
Name: freepbx-module-zapauto
-Version: 0.6.3
+Version: 0.6.4
Release: 1
License: GPL
Group: Applications/System
@@ -58,6 +58,14 @@
/var/lib/asterisk/bin/zap.template
%changelog
+* Wed 18 Apr 2007 Diego Iastrubni <diego.iastrubni at xorcom.com> - 0.6.4-1
+- Restart of asterisk + zaptel is done only once
+- Script will change colors:
+ - blue means running
+ - green means ended ok
+ - red means ended with a problem
+- Updated freePBX configuration to reflect new version (forgotten in last update)
+
* Sun Apr 15 2007 Diego Iastrubni <diego.iastrubni at xorcom.com> - 0.6.3-1
- Code supports freePBX 2.1 and 2.2
Modified: freepbx/modules-2.2/modules/freepbx-module-zapauto/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/module.xml 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/module.xml 2007-04-18 13:44:49 UTC (rev 3432)
@@ -1,13 +1,13 @@
<module>
<rawname>zapauto</rawname>
<name>Zaptel configuration</name>
- <version>0.6.1</version>
+ <version>0.6.4</version>
<type>setup</type>
<category>System Admin</category>
<menuitems>
<zapauto>Zaptel configuration</zapauto>
</menuitems>
- <location>release/zapauto-0.6.1.tgz</location>
+ <location>release/zapauto-0.6.4.tgz</location>
<info>http://xorcom.com</info>
<md5sum>XXXXXXXXXXXXXXX</md5sum>
</module>
Modified: freepbx/modules-2.2/modules/freepbx-module-zapauto/page.zapauto.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/page.zapauto.php 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/page.zapauto.php 2007-04-18 13:44:49 UTC (rev 3432)
@@ -1,7 +1,7 @@
<?php
/*
* Written by Diego Iastrubni <diego.iastrubni at xorcom.com>
- * Copyright (C) 2005,2006 Xorcom
+ * Copyright (C) 2005,2006,2007 Xorcom
*
* All rights reserved.
*
Modified: freepbx/modules-2.2/modules/freepbx-module-zapauto/share/detect_zap
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/share/detect_zap 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/share/detect_zap 2007-04-18 13:44:49 UTC (rev 3432)
@@ -1,7 +1,7 @@
#!/bin/sh
# Written by Diego Iastrubni <diego.iastrubni at xorcom.com>
-# Copyright (C) 2005,2006 Xorcom
+# Copyright (C) 2005,2006,2007 Xorcom
#
# All rights reserved.
#
@@ -67,9 +67,9 @@
blank_file /etc/asterisk/zapata_additional.conf
touch /etc/asterisk/zapata_additional.conf
+# do not run the version in /usr/local/sbin,
+# since trixbox contains a stupid version out there
/usr/sbin/genzaptelconf -d -s -M -F
-/etc/init.d/zaptel restart
-/etc/init.d/asterisk restart
echo ' * Generating amportal configuration'
chown asterisk: /etc/asterisk/zapata*
Modified: freepbx/modules-2.2/modules/freepbx-module-zapauto/share/zap2amp
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/share/zap2amp 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/share/zap2amp 2007-04-18 13:44:49 UTC (rev 3432)
@@ -353,12 +353,10 @@
my $version = @{ $row }[0];
if ( $version =~ /^2\.1/ ){
if ($debug==1) { printf( "Using freePBX 2.1\n" ); }
- printf( "Using freePBX 2.1\n" );
$freepbx_version = "2.1";
}
elsif ( $version =~ /^2\.2/ ){
if ($debug==1) { printf( "Using freePBX 2.2\n" ); }
- printf( "Using freePBX 2.2\n" );
$freepbx_version = "2.2";
}
else{
Modified: freepbx/modules-2.2/modules/freepbx-module-zapauto/zap_auto_ask.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/zap_auto_ask.php 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/zap_auto_ask.php 2007-04-18 13:44:49 UTC (rev 3432)
@@ -1,7 +1,7 @@
<?php
/*
* Written by Diego Iastrubni <diego.iastrubni at xorcom.com>
- * Copyright (C) 2005,2006 Xorcom
+ * Copyright (C) 2005,2006,2007 Xorcom
*
* All rights reserved.
*
Modified: freepbx/modules-2.2/modules/freepbx-module-zapauto/zap_auto_detect.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-zapauto/zap_auto_detect.php 2007-04-17 21:29:08 UTC (rev 3431)
+++ freepbx/modules-2.2/modules/freepbx-module-zapauto/zap_auto_detect.php 2007-04-18 13:44:49 UTC (rev 3432)
@@ -37,7 +37,8 @@
<h2>Performing HW detection and configuration</h2>
<style>
- .clsWorkingCode{ border: #BB0A0A 1px solid; background-color: #ffc0c0; }
+ .clsWorkingCode{ border: #0000FF 1px solid; background-color: #41AAFF; }
+ .clsFailedCode { border: #BB0A0A 1px solid; background-color: #ffc0c0; }
.clsDoneCode { border: green 1px solid; background-color: #a0FFa0; }
.clsHidden { display: none; border: 0px solid; }
</style>
@@ -47,16 +48,26 @@
</span>
<code>
- <pre id="idScriptOutout" class="clsWorkingCode">
+ <pre id="idScriptOutput" class="clsWorkingCode">
<?php
// the autodetection is done by a set of bash/perl/php scripts
// we just call them using sudo, as they need root permissions
- system("sudo /usr/share/freepbx-common/detect_zap");
+ system( "sudo /usr/share/freepbx-common/detect_zap", $detect_zap_value );
+ if ($detect_zap_value == 0)
+ $new_class = "clsDoneCode";
+ else
+ $new_class = "clsFailedCode";
?>
</pre>
</code>
<script>
document.getElementById("idWaitMessage").className = "clsHidden";
- document.getElementById("idScriptOutout").className = "clsDoneCode";
+ setTimeout( "change_output_color()", 1 );
+
+function change_output_color()
+{
+ document.getElementById("idScriptOutput").className = "<?php echo $new_class; ?>";
+ // script ended with value: <?php echo "$detect_zap_value\n"; ?>
+}
</script>
More information about the Pkg-voip-commits
mailing list