From: drowe67 Date: Mon, 18 Jan 2010 03:04:08 +0000 (+0000) Subject: name change from easy to mini X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=576d55b05c97918742af595d3734a89a31aca018;p=freetel-svn-tracking.git name change from easy to mini git-svn-id: https://svn.code.sf.net/p/freetel/code@130 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/easy-asterisk-gui/README.txt b/easy-asterisk-gui/README.txt index 8db72534..5a9c7636 100644 --- a/easy-asterisk-gui/README.txt +++ b/easy-asterisk-gui/README.txt @@ -1,9 +1,9 @@ -Easy Asterisk +Mini Asterisk ============= A simple, light weight GUI for Asterisk. -image::/images/ip04/easy.png["easy Asterisk Demo", link="easy/phones.sh.html"] +image::/images/ip04/mini.png["Mini Asterisk Demo", link="mini/phones.sh.html"] Click on the screen shot above for an on line demo. @@ -11,12 +11,12 @@ Click on the screen shot above for an on line demo. Introduction ------------ -Easy Asterisk is a simple Web GUI for Asterisk with comprehensive tool +Mini Asterisk is a simple Web GUI for Asterisk with comprehensive tool tip documentation and a learning curve of a few minutes. Analog ports and IP Phones are automatically detected, and no knowledge of Asterisk configuration is required. -Easy Asterisk is "unfeatured" - many of the Asterisk options are not +Mini Asterisk is "unfeatured" - many of the Asterisk options are not available. Instead it tries to make very basic, very common Asterisk installations fast and simple, for example: @@ -54,11 +54,11 @@ been discussing it a lot on the http://villagetelco.org[Village Telco] project. Just how easy can we make Asterisk to use? So I scratched the itch. -Easy Asterisk has the following features that make it reasonably +Mini Asterisk has the following features that make it reasonably unique. They may be good or bad features depending on your point of view! -* Easy Asterisk is "un-featured" - it hides many of the advanced +* Mini Asterisk is "un-featured" - it hides many of the advanced Asterisk features in the interest of simple and fast configuration. * Light weight so it can run on embedded boxes like the IP0X family. @@ -85,7 +85,7 @@ view! you can use it as a GUI for Asterisk on a little SOHO Linux box that is also your firewall, server etc. -* Easy Asterisk tells you when something is wrong, for example you get +* Mini Asterisk tells you when something is wrong, for example you get a warning if your Phone System can't see the Internet. * Extensive pre-configuration of extensions.conf and sip.conf, @@ -113,17 +113,17 @@ Alpha: Implementation Notes -------------------- -Easy Asterisk is written for the +Mini Asterisk is written for the http://rowetel.com/ucasterisk/ip04.html[IP0X embedded Asterisk] hardware but will also run on x86 and probably many other platforms. -Easy Asterisk has been written to be compatible with regular Asterisk +Mini Asterisk has been written to be compatible with regular Asterisk conf file configuration. Just leave the conf file lines with -"easy-asterisk" comments alone. The Asterisk conf files -extensions.conf and sip.conf are directly modified by Easy Asterisk, -but changes are limited to the "easy-asterisk" lines. +"mini-asterisk" comments alone. The Asterisk conf files +extensions.conf and sip.conf are directly modified by Mini Asterisk, +but changes are limited to the "mini-asterisk" lines. -For Auto-detection of Zap ports Easy Asterisk looks at +For Auto-detection of Zap ports Mini Asterisk looks at /etc/zapata.conf, so you may need this set up correctly for your analog hardware. On the IP0X this happens automatically. @@ -136,7 +136,7 @@ sip.conf files - back them up if you have an existing Asterisk installation that you want to keep. The IP0X ipkg does attempt to backup the modified conf files to *.bak but no guarantees.... -However once easy-asterisk is installed it should honor any manual +However once mini-asterisk is installed it should honor any manual changes made to extensions.conf and sip.conf. IP0X Installation @@ -146,7 +146,7 @@ Installation instructions for IP0X boxes running link:baps.html[BAPS], with some version of Asterisk and Zaptel installed. ------------------------------------------------------------------- -root~> ipkg install easy-asterisk +root~> ipkg install mini-asterisk ------------------------------------------------------------------- x86 Installation @@ -155,7 +155,7 @@ x86 Installation . You need a web server, Asterisk and some sort of Perl installed (very basic Perl installation is fine). Configure your web server to run CGIs (.sh and .pl) from /www (lighttpd config instructions below). -Easy Asterisk expects all files (shell, perl, html etc) to be in the +Mini Asterisk expects all files (shell, perl, html etc) to be in the same directory. If you find this painful please <>. . The process below places the web files in /www, you may like to @@ -163,17 +163,17 @@ place the files somewhere else like /www/asterisk. One of the files is named index.html so make sure you don't overwrite an existing index.html. -. Login as root to install the Easy Asterisk files: +. Login as root to install the Mini Asterisk files: + Remember to backup your existing extensions.conf & sip.conf in /etc/asterisk + ------------------------------------------------------------------- # cd ~ -# svn co https://freetel.svn.sourceforge.net/svnroot/freetel/easy-asterisk-gui +# svn co https://freetel.svn.sourceforge.net/svnroot/freetel/mini-asterisk-gui # ./update_revision.sh -# cp easy-asterisk-gui/etc/asterisk/* /etc/asterisk -# cp easy-asterisk-gui/cgi-bin/* /www +# cp mini-asterisk-gui/etc/asterisk/* /etc/asterisk +# cp mini-asterisk-gui/cgi-bin/* /www # cd /etc/asterisk # cp extensions.conf extensions.conf.def # cp sip.conf sip.conf.def @@ -204,7 +204,7 @@ Contributions I welcome sip.conf entries for your favourite ITSP (VOIP service) to help populate the Provider field of the -link:easy/voiplines.sh.html[Voip Line Screen]. +link:mini/voiplines.sh.html[Voip Line Screen]. [[support]] Support @@ -219,9 +219,9 @@ Source Code Browse: -http://freetel.svn.sourceforge.net/viewvc/freetel/easy-asterisk-gui/[http://freetel.svn.sourceforge.net/viewvc/freetel/easy-asterisk-gui/] +http://freetel.svn.sourceforge.net/viewvc/freetel/mini-asterisk-gui/[http://freetel.svn.sourceforge.net/viewvc/freetel/mini-asterisk-gui/] Check Out: - $ svn co https://freetel.svn.sourceforge.net/svnroot/freetel/easy-asterisk-gui + $ svn co https://freetel.svn.sourceforge.net/svnroot/freetel/mini-asterisk-gui diff --git a/easy-asterisk-gui/cgi-bin/about.sh b/easy-asterisk-gui/cgi-bin/about.sh index a6c3dd0f..8ca97111 100644 --- a/easy-asterisk-gui/cgi-bin/about.sh +++ b/easy-asterisk-gui/cgi-bin/about.sh @@ -1,7 +1,7 @@ #!/bin/sh # about.sh # David Rowe 7 Jan 2010 -# About screen for Easy Asterisk GUI +# About screen for Mini Asterisk GUI # check we are logged in @@ -25,7 +25,7 @@ EOF cat << EOF -Easy Asterisk - About +Mini Asterisk - About EOF cat tooltips.html @@ -40,7 +40,7 @@ cat <

About

EOF -echo ' Easy Asterisk Revision: 122 ' +echo ' Mini Asterisk Revision: 122 ' echo '  ' echo ' Brought to you by the Free Telephony Project' echo ' ' diff --git a/easy-asterisk-gui/cgi-bin/admin.sh b/easy-asterisk-gui/cgi-bin/admin.sh index 69c7f93c..9b309178 100644 --- a/easy-asterisk-gui/cgi-bin/admin.sh +++ b/easy-asterisk-gui/cgi-bin/admin.sh @@ -1,7 +1,7 @@ #!/bin/sh # admin.sh # David Rowe 7 Jan 2010 -# Admin screen for Easy Asterisk GUI +# Admin screen for Mini Asterisk GUI # check we are logged in @@ -36,7 +36,7 @@ Content-type: text/html Set-Cookie: loggedin=1; expires=Thursday, 01-Jan-98 12:00:00 GMT -Easy Asterisk - Restart +Mini Asterisk - Restart

Restarting...come back in 1 minute

@@ -65,7 +65,7 @@ EOF cat << EOF -Easy Asterisk - Admin +Mini Asterisk - Admin EOF cat tooltips.html @@ -113,7 +113,7 @@ cat <  -

Upgrade Easy Asterisk

+

Upgrade Mini Asterisk

diff --git a/easy-asterisk-gui/cgi-bin/faq.sh b/easy-asterisk-gui/cgi-bin/faq.sh index 1fdc0adb..d4ccf5d0 100644 --- a/easy-asterisk-gui/cgi-bin/faq.sh +++ b/easy-asterisk-gui/cgi-bin/faq.sh @@ -1,7 +1,7 @@ #!/bin/sh # faq.sh # David Rowe 7 Jan 2010 -# FAQ screen for Easy Asterisk GUI +# FAQ screen for Mini Asterisk GUI # check we are logged in @@ -25,7 +25,7 @@ EOF cat << EOF -Easy Asterisk - FAQ +Mini Asterisk - FAQ EOF cat tooltips.html diff --git a/easy-asterisk-gui/cgi-bin/ipphones.sh b/easy-asterisk-gui/cgi-bin/ipphones.sh index e546de6f..2ce904b1 100644 --- a/easy-asterisk-gui/cgi-bin/ipphones.sh +++ b/easy-asterisk-gui/cgi-bin/ipphones.sh @@ -1,7 +1,7 @@ #!/bin/sh # dashboard.sh # David Rowe 6 Jan 2010 -# Dashboard screen for Easy Asterisk GUI +# Dashboard screen for Mini Asterisk GUI # check we are logged in @@ -33,7 +33,7 @@ echo "" cat << EOF -Easy Asterisk - IP Phones +Mini Asterisk - IP Phones EOF diff --git a/easy-asterisk-gui/cgi-bin/login.sh b/easy-asterisk-gui/cgi-bin/login.sh index 03108d68..0ae903a8 100644 --- a/easy-asterisk-gui/cgi-bin/login.sh +++ b/easy-asterisk-gui/cgi-bin/login.sh @@ -1,7 +1,7 @@ #!/bin/sh # login.sh # David Rowe 4 Jan 2010 -# CGI for Easy Asterisk login GUI +# CGI for Mini Asterisk login GUI pass=`echo "$QUERY_STRING" | grep -oe "pass=[^&?]*" | sed -n "s/pass=//p"` @@ -16,7 +16,7 @@ if [ $? -eq 1 ]; then EOF cat << EOF - Easy Asterisk - Login + Mini Asterisk - Login @@ -38,14 +38,14 @@ else echo "Set-Cookie: loggedin=1" echo "" echo "" - echo "Easy Asterisk - Login" + echo "Mini Asterisk - Login" echo '' echo "" echo "" echo "Please wait a few seconds....." echo "" - # load easy asterisk conf files in case this is our first login + # load mini asterisk conf files in case this is our first login asterisk -rx "sip reload" 2>/dev/null 1 > /dev/null asterisk -rx "dialplan reload" 2>/dev/null 1 > /dev/null @@ -55,7 +55,7 @@ else cat < - Easy Asterisk - Login + Mini Asterisk - Login Please wait a few seconds..... diff --git a/easy-asterisk-gui/cgi-bin/logout.sh b/easy-asterisk-gui/cgi-bin/logout.sh index 90d5583e..d4306c96 100644 --- a/easy-asterisk-gui/cgi-bin/logout.sh +++ b/easy-asterisk-gui/cgi-bin/logout.sh @@ -1,13 +1,13 @@ #!/bin/sh # logout.sh # David Rowe 4 Jan 2010 -# CGI for Easy Asterisk logout GUI +# CGI for Mini Asterisk logout GUI cat <Easy Asterisk - Logout +Mini Asterisk - Logout -Easy Asterisk - Network +Mini Asterisk - Network EOF cat tooltips.html @@ -102,7 +102,7 @@ echo "" cat << EOF -Easy Asterisk - Network +Mini Asterisk - Network EOF diff --git a/easy-asterisk-gui/cgi-bin/phones.pl b/easy-asterisk-gui/cgi-bin/phones.pl index b86171ff..56f3534c 100644 --- a/easy-asterisk-gui/cgi-bin/phones.pl +++ b/easy-asterisk-gui/cgi-bin/phones.pl @@ -61,7 +61,7 @@ my %sip_ring = (); # ring flag keyed on sip.cong ext name (6011,6012 etc) open EXT, "/etc/asterisk/extensions.conf"; while () { - if (/s,1,Dial\((.*)\) ;; easy/) { + if (/s,1,Dial\((.*)\) ;; mini/) { @ring = split(/&/, $1); #print "'$1' '@ring'\n foreach:\n"; foreach (@ring) { diff --git a/easy-asterisk-gui/cgi-bin/phones.sh b/easy-asterisk-gui/cgi-bin/phones.sh index 7804fe2d..aa302f59 100644 --- a/easy-asterisk-gui/cgi-bin/phones.sh +++ b/easy-asterisk-gui/cgi-bin/phones.sh @@ -1,7 +1,7 @@ #!/bin/sh # phones.sh # David Rowe 4 Jan 2010 -# Phones screen for Easy Asterisk GUI +# Phones screen for Mini Asterisk GUI # check we are logged in @@ -44,7 +44,7 @@ echo "" cat << EOF -Easy Asterisk - Phones +Mini Asterisk - Phones EOF diff --git a/easy-asterisk-gui/cgi-bin/set_ring.sh b/easy-asterisk-gui/cgi-bin/set_ring.sh index 608bc4d8..d9f2bd84 100644 --- a/easy-asterisk-gui/cgi-bin/set_ring.sh +++ b/easy-asterisk-gui/cgi-bin/set_ring.sh @@ -25,7 +25,7 @@ if [ $? -eq 0 ]; then a=`echo $a | sed -n "s/&/\\\\&/pg"` fi -sed -i "s_s,1,Dial(.*) ;; easy-asterisk_s,1,Dial($a) ;; easy-asterisk_" /etc/asterisk/extensions.conf +sed -i "s_s,1,Dial(.*) ;; mini-asterisk_s,1,Dial($a) ;; mini-asterisk_" /etc/asterisk/extensions.conf asterisk -rx "dialplan reload" 2>/dev/null 1 > /dev/null # bounce us back to Phones screen @@ -33,7 +33,7 @@ asterisk -rx "dialplan reload" 2>/dev/null 1 > /dev/null cat < -Easy Asterisk - Set Ring +Mini Asterisk - Set Ring Please wait a few seconds..... diff --git a/easy-asterisk-gui/cgi-bin/set_voiplines.pl b/easy-asterisk-gui/cgi-bin/set_voiplines.pl index 49c89b04..2cee2e13 100644 --- a/easy-asterisk-gui/cgi-bin/set_voiplines.pl +++ b/easy-asterisk-gui/cgi-bin/set_voiplines.pl @@ -9,9 +9,9 @@ $pass = $ARGV[1]; $host = $ARGV[2]; $stanza_new = $ARGV[3]; -# We need to slurp up the easy asterisk provider and spit them +# We need to slurp up the mini asterisk provider and spit them # back out. All must be commented out except for the one that -# is selected. Hopefully non-easy asterisk content of sip.conf +# is selected. Hopefully non-mini asterisk content of sip.conf # won't be affected. open SIP, "/etc/asterisk/sip.conf"; @@ -19,25 +19,25 @@ $provider = ""; while () { # start of any new stanza switches off parsing. It may get - # switched back on below if it contains easy-asterisk - # keyword. This allows non-easy asterisk SIP stanzas to be + # switched back on below if it contains mini-asterisk + # keyword. This allows non-mini asterisk SIP stanzas to be # included in sip.conf if (/\[/) { $stanza = ""; } - # look for commented or uncommented easy asterisk provider stanza + # look for commented or uncommented mini asterisk provider stanza - if (/\[(.*)\] .* easy-asterisk/) { + if (/\[(.*)\] .* mini-asterisk/) { $stanza = $1; } if ($stanza eq "") { - # we are not in an easy-asterisk provider stanza + # we are not in an mini-asterisk provider stanza - if (/;*register => (\S*)@(\S*).*;.*(easy-asterisk.*)/) { - # an easy-asterisk register line + if (/;*register => (\S*)@(\S*).*;.*(mini-asterisk.*)/) { + # an mini-asterisk register line #print "XX stanza_new='$stanza_new' '$1' '$2' '$3'\n"; @@ -54,7 +54,7 @@ while () { } } else { - # OK, we are in an easy-asterisk stanza + # OK, we are in an mini-asterisk stanza # strip off any leading ";" @@ -84,7 +84,7 @@ while () { } } else { - # comment out unused easy-asterisk stanzas + # comment out unused mini-asterisk stanzas print ";$_"; } } diff --git a/easy-asterisk-gui/cgi-bin/tooltips.html b/easy-asterisk-gui/cgi-bin/tooltips.html index 4fd0229f..91137b23 100644 --- a/easy-asterisk-gui/cgi-bin/tooltips.html +++ b/easy-asterisk-gui/cgi-bin/tooltips.html @@ -137,7 +137,7 @@
Press this button to the latest version of - Easy Asterisk. An Easy Asterisk upgrade + Mini Asterisk. An Mini Asterisk upgrade requires an Internet connection.
diff --git a/easy-asterisk-gui/cgi-bin/voiplines.pl b/easy-asterisk-gui/cgi-bin/voiplines.pl index 990d0ea7..d8ccdca8 100644 --- a/easy-asterisk-gui/cgi-bin/voiplines.pl +++ b/easy-asterisk-gui/cgi-bin/voiplines.pl @@ -18,25 +18,25 @@ my %host = (); # host name keyed on provider while () { # start of any stanza switches off parsing. It may get switched - # back on below if it contains easy-asterisk keyword. This allows - # non-easy asterisk SIP devices to be included in sip.conf + # back on below if it contains mini-asterisk keyword. This allows + # non-mini asterisk SIP devices to be included in sip.conf if (/\[/) { $provider = ""; } - # currently disabled easy-asterisk provider + # currently disabled mini-asterisk provider - if (/^;\[(.*)\].* \"(.*)\" easy-asterisk/) { + if (/^;\[(.*)\].* \"(.*)\" mini-asterisk/) { push (@providers, $2); $provider = $2; $stanza{$2} = $1; #print "'$1' '$2'\n"; } - # current easy-asterisk provider + # current mini-asterisk provider - if (/^\[(.*)\].* \"(.*)\" easy-asterisk/) { + if (/^\[(.*)\].* \"(.*)\" mini-asterisk/) { push (@providers, $2); $provider = $2; $provider_current = $2; diff --git a/easy-asterisk-gui/cgi-bin/voiplines.sh b/easy-asterisk-gui/cgi-bin/voiplines.sh index 5abe5cbb..9067ad49 100644 --- a/easy-asterisk-gui/cgi-bin/voiplines.sh +++ b/easy-asterisk-gui/cgi-bin/voiplines.sh @@ -1,7 +1,7 @@ #!/bin/sh # voiplines.sh # David Rowe 12 Jan 2010 -# VOIP Line screen for Easy Asterisk GUI +# VOIP Line screen for Mini Asterisk GUI # check we are logged in @@ -33,7 +33,7 @@ cat voiplines.js cat << EOF -Easy Asterisk - VOIP Line +Mini Asterisk - VOIP Line EOF cat tooltips.html diff --git a/easy-asterisk-gui/etc/asterisk/extensions.conf b/easy-asterisk-gui/etc/asterisk/extensions.conf index db696720..12868e74 100644 --- a/easy-asterisk-gui/etc/asterisk/extensions.conf +++ b/easy-asterisk-gui/etc/asterisk/extensions.conf @@ -2,7 +2,7 @@ ; David Rowe 4 Jan 2010 ; -; Designed for Easy Asterisk GUI. However you can hand modify as much +; Designed for Mini Asterisk GUI. However you can hand modify as much ; as you like, as GUI scripts read/and write regular extensions.conf ; without messing with your custom dialplan @@ -52,14 +52,14 @@ exten => 6028,1,Dial(SIP/6028) exten => 6029,1,Dial(SIP/6029) exten => 6030,1,Dial(SIP/6030) -;; Pre-configured easy-asterisk outgoing Analog group +;; Pre-configured mini-asterisk outgoing Analog group exten => _0.,1,Dial(Zap/g1/${EXTEN:1}) -;; Pre-configured easy-asterisk outgoing VOIP line +;; Pre-configured mini-asterisk outgoing VOIP line exten => _1.,1,Dial(SIP/voip/${EXTEN:1}) ;; Pre-configured incoming calls -exten => s,1,Dial(SIP/6011) ;; easy-asterisk - don't remove this comment +exten => s,1,Dial(SIP/6011) ;; mini-asterisk - don't remove this comment diff --git a/easy-asterisk-gui/etc/asterisk/sip.conf b/easy-asterisk-gui/etc/asterisk/sip.conf index 9ee3f209..ee3e1046 100644 --- a/easy-asterisk-gui/etc/asterisk/sip.conf +++ b/easy-asterisk-gui/etc/asterisk/sip.conf @@ -151,10 +151,10 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; Default is 0 tries, continue forever ;callevents=no ; generate manager events when sip ua performs events (e.g. hold) -; register easy-asterisk voip line providers here +; register mini-asterisk voip line providers here -register => user@generic ; easy-asterisk - do not change this comment -;register => user@oeg ; easy-asterisk - do not change this comment +register => user@generic ; mini-asterisk - do not change this comment +;register => user@oeg ; mini-asterisk - do not change this comment ;----------------------------------------- NAT SUPPORT ------------------------ ; The externip, externhost and localnet settings are used if you use Asterisk @@ -528,9 +528,9 @@ callerid=6018 disallow=all allow=ulaw,g729 -; Pre-configured easy-asterisk SIP trunks +; Pre-configured mini-asterisk SIP trunks -[generic] ; "Generic" easy-asterisk do not remove this comment +[generic] ; "Generic" mini-asterisk do not remove this comment type=friend context=default username=user @@ -541,7 +541,7 @@ disallow=all allow=ulaw,g729 qualify=yes -;[oeg] ; "OEG" easy-asterisk do not remove this comment +;[oeg] ; "OEG" mini-asterisk do not remove this comment ;host=voip.oeg.com.au ;secret=pass ;username=your user number

Login