[Pkg-voip-commits] r3180 - in freepbx/trunk/debian/rapid/astetc: . manager.d

[Diego Iastrubni]

Author: elcuco-guest
Date: 2007-02-25 16:30:20 +0100 (Sun, 25 Feb 2007)
New Revision: 3180

Removed:
   freepbx/trunk/debian/rapid/astetc/manager.conf.template
Modified:
   freepbx/trunk/debian/rapid/astetc/manager.conf
   freepbx/trunk/debian/rapid/astetc/manager.d/freepbx.conf
Log:
the asterisk-api module was not working, because manager.conf did not include
manager_additional.conf. i also took the opportunity to remove the manager.conf.template 
(what was this doing there anyway...?) and modifying some comments in some other configuration files.




Modified: freepbx/trunk/debian/rapid/astetc/manager.conf
===================================================================
--- freepbx/trunk/debian/rapid/astetc/manager.conf	2007-02-24 16:05:50 UTC (rev 3179)
+++ freepbx/trunk/debian/rapid/astetc/manager.conf	2007-02-25 15:30:20 UTC (rev 3180)
@@ -6,9 +6,15 @@
 port = 5038
 bindaddr = 0.0.0.0
 
-; note that the manager_cusrom.conf file might be removed soon
-; if you need to have other manager users, please add a file in the
-; manager.d direcroty
+
+; asterisk-api module needs this
+#include manager_additional.conf
+
+; Customizations to the manager configuration should be made in
+; manager_custom.conf
+; note that in future versions of this debian package
+; this file will be deprecated, and users are strongly
+; encouraged to put custom files in manager.d/*.conf
 #include manager_custom.conf
 
 ; use creative permission games to allow other serivces to create their own

Deleted: freepbx/trunk/debian/rapid/astetc/manager.conf.template
===================================================================
--- freepbx/trunk/debian/rapid/astetc/manager.conf.template	2007-02-24 16:05:50 UTC (rev 3179)
+++ freepbx/trunk/debian/rapid/astetc/manager.conf.template	2007-02-25 15:30:20 UTC (rev 3180)
@@ -1,27 +0,0 @@
-;
-; Asterisk Call Management support
-;
-[general]
-enabled = yes
-port = 5038
-bindaddr = 0.0.0.0
-
-[AMPMGRUSER]
-secret = AMPMGRPASS
-deny=0.0.0.0/0.0.0.0
-permit=127.0.0.1/255.255.255.0
-read = system,call,log,verbose,command,agent,user
-write = system,call,log,verbose,command,agent,user
-
-#include manager_additional.conf
-
-; Customizations to the manager configuration should be made in
-; manager_custom.conf
-; note that in future versions of this debian package
-; this file will be deprecated, and users are strongly
-; encouraged to put custom files in manager.d/*.conf
-#include manager_custom.conf
-
-; include other user/package configuration
-#include "manager.d/*.conf"
- 
\ No newline at end of file

Modified: freepbx/trunk/debian/rapid/astetc/manager.d/freepbx.conf
===================================================================
--- freepbx/trunk/debian/rapid/astetc/manager.d/freepbx.conf	2007-02-24 16:05:50 UTC (rev 3179)
+++ freepbx/trunk/debian/rapid/astetc/manager.d/freepbx.conf	2007-02-25 15:30:20 UTC (rev 3180)
@@ -1,7 +1,9 @@
 ;
 ; Manager user for FreePBX
 ;
-; If you modify this file, please modify /etc/amportal.conf as well
+; you should not modify this file directly
+; the correct way should be modifying /etc/amportal.conf
+; and the running /usr/share/freepbx-common/applyconf.sh 
 [AMPMGRUSER]
 secret = AMPMGRPASS
 deny=0.0.0.0/0.0.0.0