diff options
| author | Iordan Iordanov <iiordanov@gmail.com> | 2011-10-31 01:00:22 +0000 |
|---|---|---|
| committer | Iordan Iordanov <iiordanov@gmail.com> | 2011-10-31 01:00:22 +0000 |
| commit | 62118b369bdc6db3c5d9d680e7f941ebe9235c27 (patch) | |
| tree | ce9dc2b129c46cb4d89bbef165758755768f8ac2 /applications/luci-pbx/root/etc | |
| parent | 96f494f4bae187c700e9d9ad77f77b4085908e9a (diff) | |
1) Made pbx-asterisk executable.
2) Removed a few unused templates.
3) Removed old firewall rule-creation routine from pbx-asterisk.
4) Updated text on main page.
Diffstat (limited to 'applications/luci-pbx/root/etc')
3 files changed, 0 insertions, 48 deletions
diff --git a/applications/luci-pbx/root/etc/init.d/pbx-asterisk b/applications/luci-pbx/root/etc/init.d/pbx-asterisk index d96eb4f08f..d97854d7f8 100644..100755 --- a/applications/luci-pbx/root/etc/init.d/pbx-asterisk +++ b/applications/luci-pbx/root/etc/init.d/pbx-asterisk @@ -33,8 +33,6 @@ ASTGROUP=nogroup ASTDIRSRECURSIVE="/var/run/asterisk /var/log/asterisk /var/spool/asterisk" ASTDIRS="/usr/lib/asterisk" -FIREWALL_PATH="/etc/asterisk/firewall.$MODULENAME" - TEMPLATEDIR=/etc/${MODULENAME}-asterisk ASTERISKDIR=/etc/asterisk WORKDIR=/tmp/$MODULENAME.$$ @@ -73,7 +71,6 @@ TMPL_EXTOUTGTALK=$TEMPLATEDIR/extensions_outgoing_gtalk.conf.TEMPLATE TMPL_EXTOUTLOCAL=$TEMPLATEDIR/extensions_outgoing_dial_local_user.conf.TEMPLATE TMPL_EXTOUTSIP=$TEMPLATEDIR/extensions_outgoing_sip.conf.TEMPLATE -TMPL_FIREWALL=$TEMPLATEDIR/firewall.$MODULENAME.TEMPLATE TMPL_JABBER=$TEMPLATEDIR/jabber.conf.TEMPLATE TMPL_JABBERUSER=$TEMPLATEDIR/jabber_users.conf.TEMPLATE TMPL_SIP=$TEMPLATEDIR/sip.conf.TEMPLATE @@ -557,47 +554,6 @@ pbx_fix_ownership() chown $ASTUSER:$ASTGROUP -R $ASTDIRSRECURSIVE } -# Creates firewall configuration. However, since this functionality is now -# taken over by pbx-advanced.lua, this function is unused. -create_firewall_config() -{ - local bindport - local rtpstart - local rtpend - local externhost - - config_get bindport advanced bindport - config_get externhost advanced externhost - config_get rtpstart advanced rtpstart - config_get rtpend advanced rtpend - - # We need all of these parameters to be set in order to consider inserting firewall rules. - if [ -z "$externhost" -o -z "$bindport" -o -z "$rtpstart" -o -z "$rtpend" ] ; then - rm -f $FIREWALL_PATH - return - fi - - sed "s/|SIPPORT|/$bindport/g" $TMPL_FIREWALL |\ - sed "s/|RTPRANGE|/$rtpstart:$rtpend/g" > $WORKDIR/firewall.$MODULENAME - - # Make sure there is an include section in the firewall configuration - # to include the file we just created. - i=0 ; found_path=0 - while p=`uci get firewall.@include[$i].path 2>/dev/null` ; do - if [ "$p" = "$FIREWALL_PATH" ] ; then - found_path=1 - break - fi - i=`expr $i + 1` - done - - # If no include section was found which mentions $FIREWALL_PATH, add one. - if [ $found_path -eq 0 ] ; then - uci add firewall include 1>/dev/null 2>/dev/null - uci set firewall.@include[-1].path="$FIREWALL_PATH" - uci commit firewall - fi -} start() { mkdir -p $WORKDIR diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_context_header.conf.TEMPLATE b/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_context_header.conf.TEMPLATE deleted file mode 100644 index a7f36cf910..0000000000 --- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_context_header.conf.TEMPLATE +++ /dev/null @@ -1,2 +0,0 @@ - -[context-outgoing-|NAME|] diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/firewall.home-pbx.TEMPLATE b/applications/luci-pbx/root/etc/pbx-asterisk/firewall.home-pbx.TEMPLATE deleted file mode 100644 index 91e9f66d88..0000000000 --- a/applications/luci-pbx/root/etc/pbx-asterisk/firewall.home-pbx.TEMPLATE +++ /dev/null @@ -1,2 +0,0 @@ -iptables -I INPUT 3 -p udp -s 0/0 -d 0/0 --dport |SIPPORT| -j ACCEPT -iptables -I INPUT 3 -p udp -s 0/0 -d 0/0 --dport |RTPRANGE| -j ACCEPT |