[Pkg-voip-commits] r3181 - in freepbx/trunk/debian: . patches rapid
Chris Halls
halls at alioth.debian.org
Mon Feb 26 14:58:33 CET 2007
Author: halls
Date: 2007-02-26 14:58:32 +0100 (Mon, 26 Feb 2007)
New Revision: 3181
Added:
freepbx/trunk/debian/patches/path-to-fop.dpatch
Modified:
freepbx/trunk/debian/changelog
freepbx/trunk/debian/control
freepbx/trunk/debian/freepbx-panel.postinst
freepbx/trunk/debian/patches/00list
freepbx/trunk/debian/patches/fix-fop-config.dpatch
freepbx/trunk/debian/patches/fix-open-or-die.dpatch
freepbx/trunk/debian/patches/fix-recordings.dpatch
freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg.dpatch
freepbx/trunk/debian/rapid/apply_conf.sh
Log:
- fix link to display op-panel (path-to-fop.dpatch)
- generate and use op_buttons.cfg in /etc/op-panel/freepbx (modified fix-retrieve-op-panel-cfg.dpatch)
- fix op-panel update in apply_conf.sh
- suggest ari, not Recommend, until permissions problems are fixed
- re-enable fix-recordings.dpatch
- update and re-enable fix-open-or-die
Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/changelog 2007-02-26 13:58:32 UTC (rev 3181)
@@ -16,16 +16,22 @@
* freepbx-admin: freepbx-enable-all-modules has been ported to the new module_admin script
[ Chris Halls ]
- * freepbx-panel: op-panel now uses asterisk user
- * freepbx-panel: Depend on op-panel >= 0.26.dfsg-5 where this change
- happened
+ * freepbx-panel:
+ - op-panel now uses asterisk user
+ - Depend on op-panel >= 0.26.dfsg-5 where this change happened
+ - fix link to display op-panel (path-to-fop.dpatch)
+ - generate and use op_buttons.cfg in /etc/op-panel/freepbx
+ (modified fix-retrieve-op-panel-cfg.dpatch)
+ - fix panel update in apply_conf.sh
* fix generation of *_additional.conf files if datbase configuration is not
explicitly specified in amportal.conf (use-conf-defaults.dpatch)
* fix trunk dialing rules and recording (fix-agibin-dir.dpatch)
* vmail.cgi has been quietly dropped (see SVN changeset 2020). Remove
- freepbx-vmail package and Recommend ari.
+ freepbx-vmail package and Suggest ari.
+ * re-enable fix-recordings.dpatch
+ * update and re-enable fix-open-or-die.dpatch
- -- Chris Halls <halls at debian.org> Thu, 22 Feb 2007 17:32:05 +0000
+ -- Chris Halls <halls at debian.org> Mon, 26 Feb 2007 10:46:45 +0000
freepbx (2.1.3.dfsg-1) UNRELEASED; urgency=low
Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/control 2007-02-26 13:58:32 UTC (rev 3181)
@@ -12,7 +12,7 @@
Package: freepbx
Architecture: all
Depends: freepbx-admin, freepbx-agi, freepbx-panel, asterisk-sounds-moh-freepbx
-Recommends: ari
+Suggests: ari
Description: web-based management interface for the Asterisk PBX
FreePBX (formally AMP) is a web-based GUI for the Asterisk PBX.
It provides the ability to:
Modified: freepbx/trunk/debian/freepbx-panel.postinst
===================================================================
--- freepbx/trunk/debian/freepbx-panel.postinst 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/freepbx-panel.postinst 2007-02-26 13:58:32 UTC (rev 3181)
@@ -31,9 +31,8 @@
--slave /etc/op-panel/op_astdb.cfg op-astdb-cfg /etc/op-panel/freepbx/op_astdb.cfg \
--slave /etc/op-panel/op_style.cfg op-style-cfg /etc/op-panel/freepbx/op_style.cfg
-
# make the op-panel aware of the new configuration
- invoke-rc.d op-panel restart
+ /usr/share/freepbx-common/apply_conf.sh
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/patches/00list 2007-02-26 13:58:32 UTC (rev 3181)
@@ -3,20 +3,23 @@
fix-module_admin
fix-warning-sqlite
use-conf-defaults
+fix-open-or-die
# debian/xorcom enhancements
ast-config-dirs
-fix-fop-config.dpatch
-fix-retrieve-op-panel-cfg
disable-online-updates
clean-install-amp
fix-agibin-dir
+fix-recordings
+# integration with debian's op-panel
+fix-fop-config.dpatch
+fix-retrieve-op-panel-cfg
+path-to-fop
+
# backports from trunk
add-sqlite3-support
# pending patches, still need to be ported
# to freepbx-2.2
-#fix-open-or-die
-#fix-recordings
#fix-wierd-email
Modified: freepbx/trunk/debian/patches/fix-fop-config.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-fop-config.dpatch 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/patches/fix-fop-config.dpatch 2007-02-26 13:58:32 UTC (rev 3181)
@@ -12,9 +12,9 @@
@DPATCH@
-diff -urNad upstream~/amp_conf/htdocs_panel/op_server.cfg upstream/amp_conf/htdocs_panel/op_server.cfg
---- upstream~/amp_conf/htdocs_panel/op_server.cfg 2006-09-16 11:19:23.000000000 +0300
-+++ upstream/amp_conf/htdocs_panel/op_server.cfg 2007-01-14 12:24:43.000000000 +0200
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_server.cfg freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_server.cfg
+--- freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_server.cfg 2007-02-26 10:29:49.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_server.cfg 2007-02-26 10:31:41.000000000 +0000
@@ -11,8 +11,8 @@
manager_host=127.0.0.1
Modified: freepbx/trunk/debian/patches/fix-open-or-die.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-open-or-die.dpatch 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/patches/fix-open-or-die.dpatch 2007-02-26 13:58:32 UTC (rev 3181)
@@ -4,129 +4,86 @@
## DP: Fix some perl syntax issues.
@DPATCH@
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/ampbackup.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/ampbackup.pl
---- freepbx-2.1.3.dfsg/amp_conf/bin/ampbackup.pl 2005-06-10 21:33:43.000000000 +0300
-+++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/ampbackup.pl 2006-11-26 12:03:32.000000000 +0200
-@@ -52,7 +52,7 @@
- # the name of the database our tables are kept
- $database = "asterisk";
-
--open(FILE, "/etc/amportal.conf") || die "Failed to open amportal.conf\n";
-+open(FILE, "/etc/amportal.conf") || die "Failed to open amportal.conf (!$)\n";
- while (<FILE>) {
- chomp; # no newline
- s/#.*//; # no comments
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/fax-process.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/fax-process.pl
---- freepbx-2.1.3.dfsg/amp_conf/bin/fax-process.pl 2006-06-09 01:23:09.000000000 +0300
-+++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/fax-process.pl 2006-11-26 12:03:57.000000000 +0200
-@@ -74,7 +74,7 @@
- # Lets make sure that we know about a file...
- die $usage unless $file;
- # and that the file exists...
--open FILE, $file or die "Error opening $file: $!";
-+open (FILE, $file) or die "Error opening $file: $!";
- # Oh, did we possibly not specify an attachment name?
- $attachment = $file unless ($attachment);
-
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_backup_cron_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_backup_cron_from_mysql.pl
---- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_backup_cron_from_mysql.pl 2006-09-11 05:56:34.000000000 +0300
-+++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_backup_cron_from_mysql.pl 2006-11-26 12:01:52.000000000 +0200
-@@ -40,7 +40,7 @@
- $hostname = $ampconf->{"AMPDBHOST"};
-
- ################### END OF CONFIGURATION #######################
--open(FILE, "/etc/amportal.conf") || die "Failed to open amportal.conf\n";
-+open(FILE, "/etc/amportal.conf") or die "Failed to open amportal.conf (!$)\n";
- while (<FILE>) {
- chomp; # no newline
- s/#.*//; # no comments
-@@ -58,7 +58,7 @@
- $password = $User_Preferences{"AMPDBPASS"};
-
-
--open EXTEN, ">$Backup_cron" or die "Cannot create\/overwrite cron file: $Backup_cron\n";
-+open EXTEN, ">$Backup_cron" or die "Cannot create\/overwrite cron file: $Backup_cron (!$)\n";
-
- $dbh = DBI->connect("dbi:mysql:dbname=$database;host=$hostname", "$username", "$password");
-
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl
---- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2006-04-25 23:40:47.000000000 +0300
-+++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2006-11-26 12:04:34.000000000 +0200
-@@ -67,7 +67,7 @@
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_iax_conf_from_mysql.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl
+--- freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2007-02-26 11:23:37.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2007-02-26 11:26:40.000000000 +0000
+@@ -75,8 +75,8 @@
exit;
}
--open EXTEN, ">$iax_conf" or die "Cannot create/overwrite extensions file: $iax_conf\n";
-+open (EXTEN, ">$iax_conf") or die "Cannot create/overwrite extensions file: $iax_conf (!$)\n";
- $additional = "";
- my @resultSet = @{$result};
- if ( $#resultSet > -1 ) {
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl
---- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-11-26 12:00:17.000000000 +0200
-+++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-11-26 12:02:21.000000000 +0200
+-open( EXTEN, ">$iax_conf" ) or die "Cannot create/overwrite IAX file: $iax_conf (!$)\n";
+-open( REG, ">$iax_reg" ) or die "Cannot create/overwrite IAX Registration file: $iax_reg (!$)\n";
++open( EXTEN, ">$iax_conf" ) or die "Cannot create/overwrite IAX file: $iax_conf ($!)\n";
++open( REG, ">$iax_reg" ) or die "Cannot create/overwrite IAX Registration file: $iax_reg ($!)\n";
+
+ print EXTEN $warning_banner;
+ print REG $warning_banner;
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_op_conf_from_mysql.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl
+--- freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-02-26 11:23:37.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-02-26 11:27:04.000000000 +0000
@@ -53,7 +53,7 @@
$zaplabel="Zap \%c";
$lastlabelnum=0;
- open ZAPATA, "<$conffile" || die "Cannot open config file: $zapataconf\n";
-+ open( ZAPATA, "<$conffile" ) or die "Cannot open config file: $zapataconf (!$)\n";
++ open( ZAPATA, "<$conffile" ) or die "Cannot open config file: $zapataconf ($!)\n";
while( $line = <ZAPATA> ) {
next if $line =~ /^(\s)*$/;
chomp($line);
-@@ -143,7 +143,7 @@
+@@ -179,7 +179,7 @@
$dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
}
--open EXTEN, ">$op_conf" || die "Cannot create/overwrite config file: $op_conf\n";
-+open( EXTEN, ">$op_conf" ) or die "Cannot create/overwrite config file: $op_conf (!$)\n";
+-open( EXTEN, ">$op_conf" ) or die "Cannot create/overwrite config file: $op_conf (!$)\n";
++open( EXTEN, ">$op_conf" ) or die "Cannot create/overwrite config file: $op_conf ($!)\n";
+ print EXTEN $warning_banner;
#First, populate extensions
-
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl
---- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl 2006-02-17 00:40:17.000000000 +0200
-+++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl 2006-11-26 12:00:17.000000000 +0200
-@@ -11,7 +11,7 @@
- my $filename = $_[0];
- my %ampconf;
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_parse_amportal_conf.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl
+--- freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_parse_amportal_conf.pl 2007-02-26 11:23:40.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl 2007-02-26 11:27:16.000000000 +0000
+@@ -15,7 +15,7 @@
+ AMPENGINE => "asterisk",
+ );
-- open(AMPCONF, $filename) || die "Cannot open $filename";
-+ open(AMPCONF, $filename) or die "Cannot open $filename (!$)";
+- open(AMPCONF, $filename) or die "Cannot open $filename";
++ open(AMPCONF, $filename) or die "Cannot open $filename ($!)";
while (<AMPCONF>)
{
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl
---- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2006-03-06 17:07:41.000000000 +0200
-+++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2006-11-26 12:02:43.000000000 +0200
-@@ -62,7 +62,7 @@
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_queues_conf_from_mysql.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl
+--- freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2007-02-26 11:23:37.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2007-02-26 11:27:31.000000000 +0000
+@@ -67,7 +67,7 @@
exit;
}
--open EXTEN, ">$queues_conf" or die "Cannot create/overwrite extensions file: $queues_conf\n";
-+open EXTEN, ">$queues_conf" or die "Cannot create/overwrite extensions file: $queues_conf (!$)\n";
+-open( EXTEN, ">$queues_conf" ) or die "Cannot create/overwrite extensions file: $queues_conf (!$)\n";
++open( EXTEN, ">$queues_conf" ) or die "Cannot create/overwrite extensions file: $queues_conf ($!)\n";
+ print EXTEN $warning_banner;
+
$additional = "";
- my @resultSet = @{$result};
- if ( $#resultSet > -1 ) {
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl
---- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2006-04-25 23:40:47.000000000 +0300
-+++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2006-11-26 12:02:54.000000000 +0200
-@@ -66,7 +66,7 @@
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_sip_conf_from_mysql.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl
+--- freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2007-02-26 11:23:37.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2007-02-26 11:27:49.000000000 +0000
+@@ -71,7 +71,7 @@
exit;
}
--open EXTEN, ">$sip_conf" or die "Cannot create/overwrite extensions file: $sip_conf\n";
-+open EXTEN, ">$sip_conf" or die "Cannot create/overwrite extensions file: $sip_conf (!$)\n";
+-open( EXTEN, ">$sip_conf" ) or die "Cannot create/overwrite extensions file: $sip_conf (!$)\n";
++open( EXTEN, ">$sip_conf" ) or die "Cannot create/overwrite extensions file: $sip_conf ($!)\n";
+ print EXTEN $warning_banner;
+
$additional = "";
- my @resultSet = @{$result};
- if ( $#resultSet > -1 ) {
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl
---- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2006-04-25 23:40:47.000000000 +0300
-+++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2006-11-26 12:03:13.000000000 +0200
-@@ -66,7 +66,7 @@
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_zap_conf_from_mysql.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl
+--- freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2007-02-26 11:23:37.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2007-02-26 11:28:00.000000000 +0000
+@@ -72,7 +72,7 @@
exit;
}
--open EXTEN, ">$zap_conf" or die "Cannot create/overwrite extensions file: $zap_conf\n";
-+open EXTEN, ">$zap_conf" or die "Cannot create/overwrite extensions file: $zap_conf ($!)\n";
+-open( EXTEN, ">$zap_conf" ) or die "Cannot create/overwrite extensions file: $zap_conf (!$)\n";
++open( EXTEN, ">$zap_conf" ) or die "Cannot create/overwrite extensions file: $zap_conf ($!)\n";
+ print EXTEN $warning_banner;
+
$additional = "";
- my @resultSet = @{$result};
- if ( $#resultSet > -1 ) {
Modified: freepbx/trunk/debian/patches/fix-recordings.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-recordings.dpatch 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/patches/fix-recordings.dpatch 2007-02-26 13:58:32 UTC (rev 3181)
@@ -5,10 +5,10 @@
## DP: we can rename them to the correct names in an atomic command
@DPATCH@
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf /tmp/dpep.c51xrf/freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf
---- freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf 2006-11-26 15:15:22.000000000 +0200
-+++ /tmp/dpep.c51xrf/freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf 2006-11-26 15:17:11.000000000 +0200
-@@ -543,11 +543,11 @@
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/astetc/extensions.conf freepbx-2.2.0~dfsg/amp_conf/astetc/extensions.conf
+--- freepbx-2.2.0~dfsg~/amp_conf/astetc/extensions.conf 2007-02-26 10:29:49.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/astetc/extensions.conf 2007-02-26 10:41:41.000000000 +0000
+@@ -653,11 +653,11 @@
[macro-systemrecording]
exten => s,1,Goto(${ARG1},1)
Modified: freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg.dpatch 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg.dpatch 2007-02-26 13:58:32 UTC (rev 3181)
@@ -1,18 +1,31 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-retrieve-op-panel-cfg.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
##
-## DP: By default freePBX's script saves into the webroot. it should save the config into /etc/op-panel
+## DP: By default freePBX's script saves into the webroot. it should save the config into /etc/op-panel/freepbx
@DPATCH@
-diff -urNad upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl /tmp/dpep.XTjPf1/upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl
---- upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-03-06 17:07:41.000000000 +0200
-+++ /tmp/dpep.XTjPf1/upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-05-14 13:32:56.000000000 +0300
-@@ -98,7 +98,7 @@
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_op_conf_from_mysql.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl
+--- freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-02-26 10:29:49.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-02-26 10:34:23.000000000 +0000
+@@ -138,7 +138,7 @@
$ampconf = parse_amportal_conf( "/etc/amportal.conf" );
# WARNING: this file will be substituted by the output of this program
-$op_conf = $ampconf->{"AMPWEBROOT"}."/panel/op_buttons_additional.cfg";
-+$op_conf = "/etc/op-panel/op_buttons_additional.cfg";
++$op_conf = "/etc/op-panel/freepbx/op_buttons_additional.cfg";
# username to connect to the database
$username = $ampconf->{"AMPDBUSER"};
# password to connect to the database
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_buttons.cfg freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_buttons.cfg
+--- freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_buttons.cfg 2006-10-16 01:57:56.000000000 +0100
++++ freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_buttons.cfg 2007-02-26 10:36:17.000000000 +0000
+@@ -1,7 +1,7 @@
+-include => op_buttons_additional.cfg
++include => freepbx/op_buttons_additional.cfg
+
+ ; use this for your customizations to FOP
+-include => op_buttons_custom.cfg
++include => freepbx/op_buttons_custom.cfg
+
+ ; queues
+ [rectangle]
Added: freepbx/trunk/debian/patches/path-to-fop.dpatch
===================================================================
--- freepbx/trunk/debian/patches/path-to-fop.dpatch 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/patches/path-to-fop.dpatch 2007-02-26 13:58:32 UTC (rev 3181)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## path-to-fop.dpatch by Chris Halls <halls at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/htdocs/admin/panel.php freepbx-2.2.0~dfsg/amp_conf/htdocs/admin/panel.php
+--- freepbx-2.2.0~dfsg~/amp_conf/htdocs/admin/panel.php 2006-10-29 17:50:45.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/htdocs/admin/panel.php 2007-02-23 22:57:17.000000000 +0000
+@@ -24,7 +24,7 @@
+ include 'header_auth.php';
+ ?>
+ </div>
+-<iframe width="97%" height="600" frameborder="0" align="top" src="../panel/index_amp.php?context=<?php echo $_SESSION["AMP_user"]->_deptname?>"></iframe>
++<iframe width="97%" height="600" frameborder="0" align="top" src="../op-panel-flash/index_amp.php?context=<?php echo $_SESSION["AMP_user"]->_deptname?>"></iframe>
+
+ </body>
+ </html>
Property changes on: freepbx/trunk/debian/patches/path-to-fop.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: freepbx/trunk/debian/rapid/apply_conf.sh
===================================================================
--- freepbx/trunk/debian/rapid/apply_conf.sh 2007-02-25 15:30:20 UTC (rev 3180)
+++ freepbx/trunk/debian/rapid/apply_conf.sh 2007-02-26 13:58:32 UTC (rev 3181)
@@ -72,22 +72,19 @@
sed -i -e "s|http://[\\w\\d]*/|http://$WEBADDRESS/|g" /etc/asterisk/vm_email.inc
-
-# ignore FOP configuration for now
-if [ -e /etc/op-panel/op_server.cfg_ ] ; then
+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/op_server.cfg
- sed -r -i "s/manager_secret=[a-zA-Z0-9]*/manager_secret=$AMPMGRPASS/" /etc/op-panel/op_server.cfg
- sed -r -i "s/web_hostname=[a-zA-Z0-9_\-\.]*/web_hostname=$AMPWEBADDRESS/" /etc/op-panel/op_server.cfg
- sed -r -i "s/security_code=[a-zA-Z0-9]*/security_code=$FOPPASSWORD/" /etc/op-panel/op_server.cfg
- sed -r -i "s!flash_dir=[a-zA-Z0-9_\-\.\/\\]*!flash_dir=$AMPWEBROOT\/panel!" /etc/op-panel/op_server.cfg
- sed -r -i "s!web_hostname=[a-zA-Z0-9\.]*!web_hostname=$AMPWEBADDRESS!" /etc/op-panel/op_server.cfg
- sed -r -i "s!web_hostname=[a-zA-Z0-9\.]*!web_hostname=$AMPWEBADDRESS!" /etc/op-panel/op_server.cfg
+ 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
echo "."
# we might find situations in which there is no file operator panel installed
- if [ -x /etc/init.d/amportal-panel ] ; then
- /etc/init.d/amportal-panel reload
+ if [ -x /etc/init.d/op-panel ] ; then
+ invoke-rc.d op-panel restart
fi
else
echo " - Ignoring op-panel configuration"
More information about the Pkg-voip-commits
mailing list