Thread: [Astlinux-commits] SF.net SVN: astlinux:[6442] branches/1.0/package/phoneprov-tools

Brought to you by: dhartman, krisk84

astlinux-commits

[Astlinux-commits] SF.net SVN: astlinux:[6442] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2014-03-07 16:44:10

Revision: 6442
          http://sourceforge.net/p/astlinux/code/6442
Author:   abelbeck
Date:     2014-03-07 16:44:05 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
phoneprov-tools, also allow ethN and brN interface names to determine the network gateway

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/phoneprov-massdeployment

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-07 04:55:12 UTC (rev 6441)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-07 16:44:05 UTC (rev 6442)
@@ -10,7 +10,7 @@
 Options:
   -f, --force-overwrite   Overwrite existing files
   -h, --help              Show this help text
-  -i, --if-name           Interface Name: INTIF, INT2IF, INT3IF, EXTIF, defaults to INTIF
+  -i, --if-name           Interface Name: INTIF, INT2IF, INT3IF, EXTIF, ethN, brN, defaults to INTIF
 '
   exit 1
 }
@@ -117,11 +117,20 @@
     sip_server_if="$EXTIF"
     sip_server_ipv4="$(find_ipv4_from_if $EXTIF)"
     ;;
+  eth*[0-9]|br*[0-9])
+    sip_server_if="$if_name"
+    sip_server_ipv4="$(find_ipv4_from_if $if_name)"
+    ;;
   *)
     usage
     ;;
 esac
 
+if [ -z "$sip_server_ipv4" ]; then
+  echo "phoneprov-build: Invalid Interface: $sip_server_if" >&2
+  exit 1
+fi
+
 if [ -z "$mac_addr" -o -z "$ext" ]; then
   usage
 fi

Modified: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-07 04:55:12 UTC (rev 6441)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-07 16:44:05 UTC (rev 6442)
@@ -13,7 +13,7 @@
   -A, --only-user-pass    Same as "-a, --auto-user-pass" without further processing
   -f, --force-overwrite   Overwrite existing files
   -h, --help              Show this help text
-  -i, --if-name           Interface Name: INTIF, INT2IF, INT3IF, EXTIF, defaults to INTIF
+  -i, --if-name           Interface Name: INTIF, INT2IF, INT3IF, EXTIF, ethN, brN, defaults to INTIF
   -p, --partial           Partial input, append "dialplan" and "sip" entries to existing
 '
   exit 1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[6450] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2014-03-11 03:07:02

Revision: 6450
          http://sourceforge.net/p/astlinux/code/6450
Author:   abelbeck
Date:     2014-03-11 03:06:59 +0000 (Tue, 11 Mar 2014)
Log Message:
-----------
phoneprov-tools, add @ACCOUNT@, @ACCOUNT1-6@, @MAC4@, @MAC6@ and @TEMPLATE@, the @MODEL@ is now defined in the [general] context, and new [general] variable 'account_sufffix' which is the text appended to the extension to yield the @ACCOUNT@ values

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/massdeployment.conf
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
    branches/1.0/package/phoneprov-tools/templates/snom320.conf
    branches/1.0/package/phoneprov-tools/templates/spa942.conf
    branches/1.0/package/phoneprov-tools/templates/yealink.conf

Modified: branches/1.0/package/phoneprov-tools/massdeployment.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/massdeployment.conf	2014-03-10 00:02:04 UTC (rev 6449)
+++ branches/1.0/package/phoneprov-tools/massdeployment.conf	2014-03-11 03:06:59 UTC (rev 6450)
@@ -2,7 +2,7 @@
 ## Mass Deployment Data for IP Phones
 ##
 ## Format:
-## phone_model mac_addr extension[/CID_Name] username password
+## template mac_addr extension[/CID_Name][;ext2/cid2;...] username password
 ##
 ## Note: Space separated entries, no quotes or spaces are allowed in the entries.
 ##       Optional CID_Name qualifier any '_' character will be mapped to a ' ' (space).

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-10 00:02:04 UTC (rev 6449)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-11 03:06:59 UTC (rev 6450)
@@ -55,14 +55,18 @@
 {
   sed -e 's/^\\#/#/' \
       -e 's/^\\\[/\[/' \
+      -e "s|@TEMPLATE@|${template}|g" \
       -e "s|@MODEL@|${model}|g" \
       -e "s|@VENDOR@|${vendor}|g" \
       -e "s|@MAC_ADDR@|${mac_addr}|g" \
       -e "s|@MAC@|${mac}|g" \
+      -e "s|@MAC4@|${mac4}|g" \
+      -e "s|@MAC6@|${mac6}|g" \
       -e "s|@EXT@|${ext}|g" \
       -e "s|@CID_NAME@|${cid_name}|g" \
       -e "s|@USERNAME@|${username}|g" \
       -e "s|@PASSWORD@|${password}|g" \
+      -e "s|@ACCOUNT@|${account}|g" \
       -e "s|@SIP_SERVER_IPV4@|${sip_server_ipv4}|g"
 }
 
@@ -72,26 +76,32 @@
       -e "s|@CID_NAME1@|${CID_NAME[1]}|g" \
       -e "s|@USERNAME1@|${USERNAME[1]}|g" \
       -e "s|@PASSWORD1@|${PASSWORD[1]}|g" \
+      -e "s|@ACCOUNT1@|${ACCOUNT[1]}|g" \
       -e "s|@EXT2@|${EXT[2]}|g" \
       -e "s|@CID_NAME2@|${CID_NAME[2]}|g" \
       -e "s|@USERNAME2@|${USERNAME[2]}|g" \
       -e "s|@PASSWORD2@|${PASSWORD[2]}|g" \
+      -e "s|@ACCOUNT2@|${ACCOUNT[2]}|g" \
       -e "s|@EXT3@|${EXT[3]}|g" \
       -e "s|@CID_NAME3@|${CID_NAME[3]}|g" \
       -e "s|@USERNAME3@|${USERNAME[3]}|g" \
       -e "s|@PASSWORD3@|${PASSWORD[3]}|g" \
+      -e "s|@ACCOUNT3@|${ACCOUNT[3]}|g" \
       -e "s|@EXT4@|${EXT[4]}|g" \
       -e "s|@CID_NAME4@|${CID_NAME[4]}|g" \
       -e "s|@USERNAME4@|${USERNAME[4]}|g" \
       -e "s|@PASSWORD4@|${PASSWORD[4]}|g" \
+      -e "s|@ACCOUNT4@|${ACCOUNT[4]}|g" \
       -e "s|@EXT5@|${EXT[5]}|g" \
       -e "s|@CID_NAME5@|${CID_NAME[5]}|g" \
       -e "s|@USERNAME5@|${USERNAME[5]}|g" \
       -e "s|@PASSWORD5@|${PASSWORD[5]}|g" \
+      -e "s|@ACCOUNT5@|${ACCOUNT[5]}|g" \
       -e "s|@EXT6@|${EXT[6]}|g" \
       -e "s|@CID_NAME6@|${CID_NAME[6]}|g" \
       -e "s|@USERNAME6@|${USERNAME[6]}|g" \
-      -e "s|@PASSWORD6@|${PASSWORD[6]}|g"
+      -e "s|@PASSWORD6@|${PASSWORD[6]}|g" \
+      -e "s|@ACCOUNT6@|${ACCOUNT[6]}|g"
 }
 
 index_var() {
@@ -123,6 +133,7 @@
   if [ -z "${PASSWORD[$i]}" ]; then
     PASSWORD[$i]="$password"
   fi
+  ACCOUNT[$i]="${EXT[$i]}${account_suffix}"
 }
 
 ARGS="$(getopt --name phoneprov-build \
@@ -146,7 +157,7 @@
   shift
 done
 
-model="$1"
+template="$1"
 mac_addr="$2"
 raw_ext="$3"
 raw_username="$4"
@@ -212,18 +223,18 @@
 esac
 mac="$(echo "$mac_addr" | tr -d ':')"
 
-if [ ! -f "$TEMPLATE_DIR/$model.conf" ]; then
-  echo "phoneprov-build: Template file \"$TEMPLATE_DIR/$model.conf\" not found." >&2
+if [ ! -f "$TEMPLATE_DIR/$template.conf" ]; then
+  echo "phoneprov-build: Template file \"$TEMPLATE_DIR/$template.conf\" not found." >&2
   exit 1
 fi
 
-if ! is_context "general" "$TEMPLATE_DIR/$model.conf"; then
+if ! is_context "general" "$TEMPLATE_DIR/$template.conf"; then
   echo "phoneprov-build: No [general] context defined, invalid template file." >&2
   exit 1
 fi
 
 # Extract General Definitions
-OPTIONS="$(extract_context "general" "$TEMPLATE_DIR/$model.conf")"
+OPTIONS="$(extract_context "general" "$TEMPLATE_DIR/$template.conf")"
 
 macaddress_case="$(extract_var macaddress_case)"
 case $macaddress_case in
@@ -232,12 +243,23 @@
   lower) mac="$(echo "$mac" | tr '[:upper:]' '[:lower:]')"
     ;;
 esac
-OPTIONS="$(echo "$OPTIONS" | merge_variables)"
+mac4="${mac:8}"
+mac6="${mac:6}"
 
+model="$(extract_var model)"
+if [ -z "$model" ]; then
+  model="$template"
+fi
 vendor="$(extract_var vendor)"
 if [ -z "$vendor" ]; then
   vendor="$model"
 fi
+
+OPTIONS="$(echo "$OPTIONS" | merge_variables)"
+
+account_suffix="$(extract_var account_suffix)"
+account=${ext}${account_suffix}
+
 prov_path="$(extract_var prov_path)"
 if [ -z "$prov_path" ]; then
   prov_path="$PHONEPROV_DIR/$vendor"
@@ -319,6 +341,7 @@
 CID_NAME[1]="$cid_name"
 USERNAME[1]="$username"
 PASSWORD[1]="$password"
+ACCOUNT[1]="$account"
 
 for index in 2 3 4 5 6; do
   define_indexed_vars $index

Modified: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-10 00:02:04 UTC (rev 6449)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-11 03:06:59 UTC (rev 6450)
@@ -38,17 +38,17 @@
 }
 
 init_args() {
-  local args="$1" model
+  local args="$1" template
 
-  model="$(echo "$args" | awk -F' ' '{ print $1; }')"
+  template="$(echo "$args" | awk -F' ' '{ print $1; }')"
 
-  echo "$model 00:00:00:00:00:00 init"
+  echo "$template 00:00:00:00:00:00 init"
 }
 
 gen_user_pass() {
-  local data="$1" model mac_addr ext_cid ext user pass
+  local data="$1" template mac_addr ext_cid ext user pass
 
-  model="$(echo "$data" | awk -F' ' '{ print $1; }')"
+  template="$(echo "$data" | awk -F' ' '{ print $1; }')"
   mac_addr="$(echo "$data" | awk -F' ' '{ print $2; }')"
   ext_cid="$(echo "$data" | awk -F' ' '{ print $3; }')"
   user="$(echo "$data" | awk -F' ' '{ print $4; }')"
@@ -56,11 +56,11 @@
 
   ext="$(echo "$ext_cid" | cut -d';' -f1 | cut -d'/' -f1)"
 
-  if [ -n "$model" -a -n "$mac_addr" -a -n "$ext" ]; then
+  if [ -n "$template" -a -n "$mac_addr" -a -n "$ext" ]; then
     if [ "$ext" != "init" -a "$ext" != "init-dialplan" -a "$ext" != "init-sip" ]; then
       if [ -z "$user" -o -z "$pass" ]; then
         if [ -z "$user" ]; then
-          user="${model}_$(echo "$mac_addr" | cut -d':' -f5)$(echo "$mac_addr" | cut -d':' -f6)_${ext}"
+          user="${ext}_$(echo "$mac_addr" | cut -d':' -f4- | tr -d ':')"
         fi
         if [ -z "$pass" ]; then
           pass="$(openssl rand -base64 12)"
@@ -68,7 +68,7 @@
         # Properly match if '*' exists in the extension/cid
         ext_cid="$(echo "$ext_cid" | sed 's/*/\\*/g')"
 
-        sed -i -e "s|^${model}[ \t]*${mac_addr}[ \t]*${ext_cid}.*$|${model} ${mac_addr} ${ext_cid} ${user} ${pass}|" "$in_file"
+        sed -i -e "s|^${template}[ \t]*${mac_addr}[ \t]*${ext_cid}.*$|${template} ${mac_addr} ${ext_cid} ${user} ${pass}|" "$in_file"
       fi
     fi
   fi

Modified: branches/1.0/package/phoneprov-tools/templates/snom320.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-03-10 00:02:04 UTC (rev 6449)
+++ branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-03-11 03:06:59 UTC (rev 6450)
@@ -5,9 +5,11 @@
 # General Definitions
 [general]
 vendor=snom
+model=snom320
 #prov_path=/mnt/kd/phoneprov/snom
 prov_file=@MODEL@-@MAC@.htm
 macaddress_case=upper
+account_suffix=_@MAC4@_@MODEL@
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf
@@ -18,12 +20,12 @@
 
 # Dialplan File entries
 [dialplan]
-exten => @EXT@,1,Dial(SIP/@USERNAME@)
+exten => @EXT@,1,Dial(SIP/@ACCOUNT@)
 
 # SIP File entries
 [sip]
 ; @EXT@ / @MAC_ADDR@ / @MODEL@
-\[@USERNAME@]
+\[@ACCOUNT@]
 type=friend
 host=dynamic
 context=internal-phones
@@ -45,7 +47,7 @@
 <phone-settings>
 <user_realname idx="1" perm="">@EXT@</user_realname>
 <user_name idx="1" perm="">@USERNAME@</user_name>
-<user_pname idx="1" perm="">@USERNAME@</user_pname>
+<user_pname idx="1" perm="">@ACCOUNT@</user_pname>
 <user_pass idx="1" perm="">@PASSWORD@</user_pass>
 <user_host idx="1" perm="">@SIP_SERVER_IPV4@</user_host>
 <user_outbound idx="1" perm="">@SIP_SERVER_IPV4@</user_outbound>

Modified: branches/1.0/package/phoneprov-tools/templates/spa942.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/spa942.conf	2014-03-10 00:02:04 UTC (rev 6449)
+++ branches/1.0/package/phoneprov-tools/templates/spa942.conf	2014-03-11 03:06:59 UTC (rev 6450)
@@ -5,9 +5,11 @@
 # General Definitions
 [general]
 vendor=linksys
+model=spa942
 prov_path=/mnt/kd/tftpboot/linksys
 prov_file=@EXT@.xml
 macaddress_case=lower
+account_suffix=_@MAC4@_@MODEL@
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf
@@ -18,12 +20,12 @@
 
 # Dialplan File entries
 [dialplan]
-exten => @EXT@,1,Dial(SIP/@USERNAME@)
+exten => @EXT@,1,Dial(SIP/@ACCOUNT@)
 
 # SIP File entries
 [sip]
 ; @EXT@ / @MAC_ADDR@ / @MODEL@
-\[@USERNAME@]
+\[@ACCOUNT@]
 type=friend
 #host=dynamic
 #<1010>host=10.10.20.20
@@ -176,7 +178,7 @@
 
   <Display_Name_1_                  ua="na"> @CID_NAME@
   </Display_Name_1_>
-  <User_ID_1_                       ua="na"> @EXT@
+  <User_ID_1_                       ua="na"> @USERNAME@
   </User_ID_1_>
   <Password_1_                      ua="na"> @PASSWORD@
   </Password_1_>

Modified: branches/1.0/package/phoneprov-tools/templates/yealink.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-03-10 00:02:04 UTC (rev 6449)
+++ branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-03-11 03:06:59 UTC (rev 6450)
@@ -5,9 +5,11 @@
 # General Definitions
 [general]
 vendor=yealink
+model=yealink
 #prov_path=/mnt/kd/phoneprov/yealink
 prov_file=@MAC@.cfg
 macaddress_case=lower
+account_suffix=_@MAC4@_@MODEL@
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf
@@ -18,12 +20,12 @@
 
 # Dialplan File entries
 [dialplan]
-exten => @EXT@,1,Dial(SIP/@USERNAME@)
+exten => @EXT@,1,Dial(SIP/@ACCOUNT@)
 
 # SIP File entries
 [sip]
 ; @EXT@ / @MAC_ADDR@ / @MODEL@
-\[@USERNAME@]
+\[@ACCOUNT@]
 type=friend
 host=dynamic
 context=internal-phones
@@ -45,7 +47,7 @@
 account.1.enable=1
 account.1.label=@EXT@
 account.1.auth_name=@USERNAME@
-account.1.user_name=@USERNAME@
+account.1.user_name=@ACCOUNT@
 account.1.password=@PASSWORD@
 account.1.sip_server.1.address=@SIP_SERVER_IPV4@
 account.1.sip_server1.port=5060

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[6451] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2014-03-11 15:21:27

Revision: 6451
          http://sourceforge.net/p/astlinux/code/6451
Author:   abelbeck
Date:     2014-03-11 15:21:23 +0000 (Tue, 11 Mar 2014)
Log Message:
-----------
phoneprov-tools, rework input format slightly for massdeployment.conf, swap password and account fields and make account optional.  Add [general] variables auto_account_prefix and auto_account_suffix for when account is not defined

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/massdeployment.conf
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
    branches/1.0/package/phoneprov-tools/templates/snom320.conf
    branches/1.0/package/phoneprov-tools/templates/spa942.conf
    branches/1.0/package/phoneprov-tools/templates/yealink.conf

Modified: branches/1.0/package/phoneprov-tools/massdeployment.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/massdeployment.conf	2014-03-11 03:06:59 UTC (rev 6450)
+++ branches/1.0/package/phoneprov-tools/massdeployment.conf	2014-03-11 15:21:23 UTC (rev 6451)
@@ -2,12 +2,12 @@
 ## Mass Deployment Data for IP Phones
 ##
 ## Format:
-## template mac_addr extension[/CID_Name][;ext2/cid2;...] username password
+## template mac_addr extension[/CID_Name][;ext2[/cid2];...] password [ account ]
 ##
 ## Note: Space separated entries, no quotes or spaces are allowed in the entries.
 ##       Optional CID_Name qualifier any '_' character will be mapped to a ' ' (space).
 ##
 ## Examples:
-## snom320 00:04:13:11:33:21 201 201 secret
-## yealink 00:15:65:22:44:12 301/Front_Desk yealink_4412_301 supersecret
+## snom320 00:04:13:11:33:21 201 secret
+## yealink 00:15:65:22:44:12 301/Front_Desk supersecret yealink_4412_301
 ##

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-11 03:06:59 UTC (rev 6450)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-11 15:21:23 UTC (rev 6451)
@@ -5,7 +5,7 @@
 usage()
 {
   echo '
-Usage: phoneprov-build [options...] phone_model mac_addr extension[/CID_Name] username password
+Usage: phoneprov-build [options...] template mac_addr extension[/CID_Name][;ext2[/cid2];...] password [ account ]
 
 Options:
   -f, --force-overwrite   Overwrite existing files
@@ -64,9 +64,9 @@
       -e "s|@MAC6@|${mac6}|g" \
       -e "s|@EXT@|${ext}|g" \
       -e "s|@CID_NAME@|${cid_name}|g" \
-      -e "s|@USERNAME@|${username}|g" \
       -e "s|@PASSWORD@|${password}|g" \
       -e "s|@ACCOUNT@|${account}|g" \
+      -e "s|@USERNAME@|${username}|g" \
       -e "s|@SIP_SERVER_IPV4@|${sip_server_ipv4}|g"
 }
 
@@ -74,34 +74,34 @@
 {
   sed -e "s|@EXT1@|${EXT[1]}|g" \
       -e "s|@CID_NAME1@|${CID_NAME[1]}|g" \
-      -e "s|@USERNAME1@|${USERNAME[1]}|g" \
       -e "s|@PASSWORD1@|${PASSWORD[1]}|g" \
       -e "s|@ACCOUNT1@|${ACCOUNT[1]}|g" \
+      -e "s|@USERNAME1@|${USERNAME[1]}|g" \
       -e "s|@EXT2@|${EXT[2]}|g" \
       -e "s|@CID_NAME2@|${CID_NAME[2]}|g" \
-      -e "s|@USERNAME2@|${USERNAME[2]}|g" \
       -e "s|@PASSWORD2@|${PASSWORD[2]}|g" \
       -e "s|@ACCOUNT2@|${ACCOUNT[2]}|g" \
+      -e "s|@USERNAME2@|${USERNAME[2]}|g" \
       -e "s|@EXT3@|${EXT[3]}|g" \
       -e "s|@CID_NAME3@|${CID_NAME[3]}|g" \
-      -e "s|@USERNAME3@|${USERNAME[3]}|g" \
       -e "s|@PASSWORD3@|${PASSWORD[3]}|g" \
       -e "s|@ACCOUNT3@|${ACCOUNT[3]}|g" \
+      -e "s|@USERNAME3@|${USERNAME[3]}|g" \
       -e "s|@EXT4@|${EXT[4]}|g" \
       -e "s|@CID_NAME4@|${CID_NAME[4]}|g" \
-      -e "s|@USERNAME4@|${USERNAME[4]}|g" \
       -e "s|@PASSWORD4@|${PASSWORD[4]}|g" \
       -e "s|@ACCOUNT4@|${ACCOUNT[4]}|g" \
+      -e "s|@USERNAME4@|${USERNAME[4]}|g" \
       -e "s|@EXT5@|${EXT[5]}|g" \
       -e "s|@CID_NAME5@|${CID_NAME[5]}|g" \
-      -e "s|@USERNAME5@|${USERNAME[5]}|g" \
       -e "s|@PASSWORD5@|${PASSWORD[5]}|g" \
       -e "s|@ACCOUNT5@|${ACCOUNT[5]}|g" \
+      -e "s|@USERNAME5@|${USERNAME[5]}|g" \
       -e "s|@EXT6@|${EXT[6]}|g" \
       -e "s|@CID_NAME6@|${CID_NAME[6]}|g" \
-      -e "s|@USERNAME6@|${USERNAME[6]}|g" \
       -e "s|@PASSWORD6@|${PASSWORD[6]}|g" \
-      -e "s|@ACCOUNT6@|${ACCOUNT[6]}|g"
+      -e "s|@ACCOUNT6@|${ACCOUNT[6]}|g" \
+      -e "s|@USERNAME6@|${USERNAME[6]}|g"
 }
 
 index_var() {
@@ -125,15 +125,15 @@
   if [ -z "${CID_NAME[$i]}" ]; then
     CID_NAME[$i]="${EXT[$i]}"
   fi
-  USERNAME[$i]="$(index_var $i "$raw_username")"
-  if [ -z "${USERNAME[$i]}" ]; then
-    USERNAME[$i]="$username"
-  fi
   PASSWORD[$i]="$(index_var $i "$raw_password")"
   if [ -z "${PASSWORD[$i]}" ]; then
     PASSWORD[$i]="$password"
   fi
-  ACCOUNT[$i]="${EXT[$i]}${account_suffix}"
+  ACCOUNT[$i]="$(index_var $i "$raw_account")"
+  if [ -z "${ACCOUNT[$i]}" ]; then
+    ACCOUNT[$i]="${auto_account_prefix}${EXT[$i]}${auto_account_suffix}"
+  fi
+  USERNAME[$i]="${ACCOUNT[$i]}"
 }
 
 ARGS="$(getopt --name phoneprov-build \
@@ -160,13 +160,13 @@
 template="$1"
 mac_addr="$2"
 raw_ext="$3"
-raw_username="$4"
-raw_password="$5"
+raw_password="$4"
+raw_account="$5"
 
 ext="$(index_var 1 "$raw_ext" | cut -d'/' -f1)"
 cid_name="$(index_var 1 "$raw_ext" | cut -s -d'/' -f2- | tr '_' ' ')"
-username="$(index_var 1 "$raw_username")"
 password="$(index_var 1 "$raw_password")"
+account="$(index_var 1 "$raw_account")"
 
 PHONEPROV_DIR="${PHONEPROV_BASE_DIR:-/mnt/kd/phoneprov}"
 TEMPLATE_DIR="$PHONEPROV_DIR/templates"
@@ -257,8 +257,8 @@
 
 OPTIONS="$(echo "$OPTIONS" | merge_variables)"
 
-account_suffix="$(extract_var account_suffix)"
-account=${ext}${account_suffix}
+auto_account_prefix="$(extract_var auto_account_prefix)"
+auto_account_suffix="$(extract_var auto_account_suffix)"
 
 prov_path="$(extract_var prov_path)"
 if [ -z "$prov_path" ]; then
@@ -326,22 +326,25 @@
   exit 0
 fi
 
-if [ -z "$username" ]; then
-  echo "phoneprov-build: no username defined." >&2
-  exit 3
-fi
 if [ -z "$password" ]; then
   echo "phoneprov-build: no password defined." >&2
   exit 3
 fi
 
+if [ -z "$account" ]; then
+  account="${auto_account_prefix}${ext}${auto_account_suffix}"
+fi
+
+# Same as account
+username="$account"
+
 # Define indexed variables
 
 EXT[1]="$ext"
 CID_NAME[1]="$cid_name"
-USERNAME[1]="$username"
 PASSWORD[1]="$password"
 ACCOUNT[1]="$account"
+USERNAME[1]="$username"
 
 for index in 2 3 4 5 6; do
   define_indexed_vars $index

Modified: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-11 03:06:59 UTC (rev 6450)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-11 15:21:23 UTC (rev 6451)
@@ -9,8 +9,8 @@
 Usage: phoneprov-massdeployment [options...] in_file
 
 Options:
-  -a, --auto-user-pass    Automatically generate missing username/password(s)
-  -A, --only-user-pass    Same as "-a, --auto-user-pass" without further processing
+  -a, --auto-pass         Automatically generate missing password(s)
+  -A, --only-pass         Same as "-a, --auto-pass" without further processing
   -f, --force-overwrite   Overwrite existing files
   -h, --help              Show this help text
   -i, --if-name           Interface Name: INTIF, INT2IF, INT3IF, EXTIF, ethN, brN, defaults to INTIF
@@ -26,8 +26,8 @@
     echo "phoneprov-massdeployment: Use -f or --force-overwrite option to overwrite."
     echo "Files left unchanged."
   elif [ $result -eq 3 ]; then
-    echo "phoneprov-massdeployment: Use -a or --auto-user-pass option to automatically"
-    echo "                          generate any missing username/password(s)."
+    echo "phoneprov-massdeployment: Use -a or --auto-pass option to automatically"
+    echo "                          generate any missing password(s)."
   fi
 }
 
@@ -45,37 +45,32 @@
   echo "$template 00:00:00:00:00:00 init"
 }
 
-gen_user_pass() {
-  local data="$1" template mac_addr ext_cid ext user pass
+gen_pass() {
+  local data="$1" template mac_addr ext_cid ext pass
 
   template="$(echo "$data" | awk -F' ' '{ print $1; }')"
   mac_addr="$(echo "$data" | awk -F' ' '{ print $2; }')"
   ext_cid="$(echo "$data" | awk -F' ' '{ print $3; }')"
-  user="$(echo "$data" | awk -F' ' '{ print $4; }')"
-  pass="$(echo "$data" | awk -F' ' '{ print $5; }')"
+  pass="$(echo "$data" | awk -F' ' '{ print $4; }')"
 
   ext="$(echo "$ext_cid" | cut -d';' -f1 | cut -d'/' -f1)"
 
   if [ -n "$template" -a -n "$mac_addr" -a -n "$ext" ]; then
     if [ "$ext" != "init" -a "$ext" != "init-dialplan" -a "$ext" != "init-sip" ]; then
-      if [ -z "$user" -o -z "$pass" ]; then
-        if [ -z "$user" ]; then
-          user="${ext}_$(echo "$mac_addr" | cut -d':' -f4- | tr -d ':')"
-        fi
-        if [ -z "$pass" ]; then
-          pass="$(openssl rand -base64 12)"
-        fi
+      if [ -z "$pass" ]; then
+        pass="$(openssl rand -base64 12)"
+
         # Properly match if '*' exists in the extension/cid
         ext_cid="$(echo "$ext_cid" | sed 's/*/\\*/g')"
 
-        sed -i -e "s|^${template}[ \t]*${mac_addr}[ \t]*${ext_cid}.*$|${template} ${mac_addr} ${ext_cid} ${user} ${pass}|" "$in_file"
+        sed -i -e "s|^${template}[ \t]*${mac_addr}[ \t]*${ext_cid}.*$|${template} ${mac_addr} ${ext_cid} ${pass}|" "$in_file"
       fi
     fi
   fi
 }
 
 ARGS="$(getopt --name phoneprov-massdeployment \
-               --long auto-user-pass,only-user-pass,force-overwrite,help,if-name:,partial \
+               --long auto-pass,only-pass,force-overwrite,help,if-name:,partial \
                --options aAfhi:p \
                -- "$@")"
 if [ $? -ne 0 ]; then
@@ -83,15 +78,15 @@
 fi
 eval set -- $ARGS
 
-auto_user_pass=0
-only_user_pass=0
+auto_pass=0
+only_pass=0
 force_overwrite=0
 partial=0
 if_name="INTIF"
 while [ $# -gt 0 ]; do
   case "$1" in
-    -a|--auto-user-pass)   auto_user_pass=1 ;;
-    -A|--only-user-pass)   auto_user_pass=1 ; only_user_pass=1 ;;
+    -a|--auto-pass)   auto_pass=1 ;;
+    -A|--only-pass)   auto_pass=1 ; only_pass=1 ;;
     -f|--force-overwrite)  force_overwrite=1 ;;
     -h|--help)             usage ;;
     -i|--if-name)          if_name="$2"; shift ;;
@@ -110,8 +105,8 @@
   exit 1
 fi
 
-if [ $auto_user_pass -eq 1 ]; then
-  echo "Auto-generating username/password(s):"
+if [ $auto_pass -eq 1 ]; then
+  echo "Auto-generating password(s):"
 
   temp_file="$(mktemp "${in_file}.XXXXXX")"
   cp "$in_file" "$temp_file"
@@ -119,18 +114,18 @@
   IFS=$'\n'
   extract_file "$temp_file" | while read data; do
     unset IFS
-    gen_user_pass "$data"
+    gen_pass "$data"
   done
   unset IFS
 
   if cmp -s "$temp_file" "$in_file"; then
-    echo "No missing username/password(s), input file left unchanged."
+    echo "No missing password(s), input file left unchanged."
   else
-    echo "Missing username/password(s) were added to input file."
+    echo "Missing password(s) were added to input file."
   fi
   rm "$temp_file"
 
-  if [ $only_user_pass -eq 1 ]; then
+  if [ $only_pass -eq 1 ]; then
     exit 0
   fi
 fi

Modified: branches/1.0/package/phoneprov-tools/templates/snom320.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-03-11 03:06:59 UTC (rev 6450)
+++ branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-03-11 15:21:23 UTC (rev 6451)
@@ -9,7 +9,8 @@
 #prov_path=/mnt/kd/phoneprov/snom
 prov_file=@MODEL@-@MAC@.htm
 macaddress_case=upper
-account_suffix=_@MAC4@_@MODEL@
+#auto_account_prefix=
+auto_account_suffix=_@MAC4@_@MODEL@
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf
@@ -30,7 +31,7 @@
 host=dynamic
 context=internal-phones
 secret=@PASSWORD@
-defaultuser=@USERNAME@
+defaultuser=@ACCOUNT@
 callerid="@CID_NAME@" <@EXT@>
 mailbox=@EXT@@default
 qualify=no
@@ -46,7 +47,7 @@
 <settings>
 <phone-settings>
 <user_realname idx="1" perm="">@EXT@</user_realname>
-<user_name idx="1" perm="">@USERNAME@</user_name>
+<user_name idx="1" perm="">@ACCOUNT@</user_name>
 <user_pname idx="1" perm="">@ACCOUNT@</user_pname>
 <user_pass idx="1" perm="">@PASSWORD@</user_pass>
 <user_host idx="1" perm="">@SIP_SERVER_IPV4@</user_host>

Modified: branches/1.0/package/phoneprov-tools/templates/spa942.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/spa942.conf	2014-03-11 03:06:59 UTC (rev 6450)
+++ branches/1.0/package/phoneprov-tools/templates/spa942.conf	2014-03-11 15:21:23 UTC (rev 6451)
@@ -9,7 +9,8 @@
 prov_path=/mnt/kd/tftpboot/linksys
 prov_file=@EXT@.xml
 macaddress_case=lower
-account_suffix=_@MAC4@_@MODEL@
+#auto_account_prefix=
+auto_account_suffix=_@MAC4@_@MODEL@
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf
@@ -40,7 +41,7 @@
 #<1019>host=10.10.20.29
 context=internal-phones
 secret=@PASSWORD@
-defaultuser=@USERNAME@
+defaultuser=@ACCOUNT@
 callerid="@CID_NAME@" <@EXT@>
 mailbox=@EXT@@default
 qualify=no
@@ -178,7 +179,7 @@
 
   <Display_Name_1_                  ua="na"> @CID_NAME@
   </Display_Name_1_>
-  <User_ID_1_                       ua="na"> @USERNAME@
+  <User_ID_1_                       ua="na"> @ACCOUNT@
   </User_ID_1_>
   <Password_1_                      ua="na"> @PASSWORD@
   </Password_1_>

Modified: branches/1.0/package/phoneprov-tools/templates/yealink.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-03-11 03:06:59 UTC (rev 6450)
+++ branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-03-11 15:21:23 UTC (rev 6451)
@@ -9,7 +9,8 @@
 #prov_path=/mnt/kd/phoneprov/yealink
 prov_file=@MAC@.cfg
 macaddress_case=lower
-account_suffix=_@MAC4@_@MODEL@
+#auto_account_prefix=
+auto_account_suffix=_@MAC4@_@MODEL@
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf
@@ -30,7 +31,7 @@
 host=dynamic
 context=internal-phones
 secret=@PASSWORD@
-defaultuser=@USERNAME@
+defaultuser=@ACCOUNT@
 callerid="@CID_NAME@" <@EXT@>
 mailbox=@EXT@@default
 qualify=no
@@ -46,7 +47,7 @@
 
 account.1.enable=1
 account.1.label=@EXT@
-account.1.auth_name=@USERNAME@
+account.1.auth_name=@ACCOUNT@
 account.1.user_name=@ACCOUNT@
 account.1.password=@PASSWORD@
 account.1.sip_server.1.address=@SIP_SERVER_IPV4@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[6456] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2014-03-12 20:54:35

Revision: 6456
          http://sourceforge.net/p/astlinux/code/6456
Author:   abelbeck
Date:     2014-03-12 20:54:32 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
phoneprov-tools, add 'yealink-2line' template

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/massdeployment.conf

Added Paths:
-----------
    branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf

Modified: branches/1.0/package/phoneprov-tools/massdeployment.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/massdeployment.conf	2014-03-12 00:31:27 UTC (rev 6455)
+++ branches/1.0/package/phoneprov-tools/massdeployment.conf	2014-03-12 20:54:32 UTC (rev 6456)
@@ -10,4 +10,5 @@
 ## Examples:
 ## snom320 00:04:13:11:33:21 201 secret
 ## yealink 00:15:65:22:44:12 301/Front_Desk supersecret yealink_4412_301
+## yealink-2line 00:15:65:22:44:23 210/Office;310/Help_Line superdupersecret
 ##

Added: branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	                        (rev 0)
+++ branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2014-03-12 20:54:32 UTC (rev 6456)
@@ -0,0 +1,81 @@
+# AstLinux provisioning template
+# for Yealink T2x, T3x models (with firmware 70 or newer) with 2 accounts
+menu_name=Yealink T2x, T3x (FW 70) 2-Line
+
+# General Definitions
+[general]
+vendor=yealink
+model=yealink
+prov_path=/mnt/kd/phoneprov/yealink
+prov_file=@MAC@.cfg
+macaddress_case=lower
+account_suffix=_@MAC4@_@MODEL@
+
+#dialplan_path=/mnt/kd/asterisk/includes
+dialplan_file=astlinux-phoneprov-exten.conf
+#dialplan_context=provisioned-phones
+
+#sip_path=/mnt/kd/asterisk/includes
+sip_file=astlinux-phoneprov-sip.conf
+
+# Dialplan File entries
+[dialplan]
+exten => @EXT1@,1,Dial(SIP/@ACCOUNT1@)
+exten => @EXT2@,1,Dial(SIP/@ACCOUNT2@)
+
+# SIP File entries
+[sip]
+; @EXT1@ / @MAC_ADDR@ / @MODEL@
+\[@ACCOUNT1@]
+type=friend
+host=dynamic
+context=internal-phones
+secret=@PASSWORD1@
+defaultuser=@ACCOUNT1@
+callerid="@CID_NAME1@" <@EXT1@>
+mailbox=@EXT1@@default
+qualify=no
+directmedia=no
+dtmfmode=rfc2833
+disallow=all
+allow=ulaw
+;allow=g722
+
+; @EXT2@ / @MAC_ADDR@ / @MODEL@
+\[@ACCOUNT2@]
+type=friend
+host=dynamic
+context=internal-phones
+secret=@PASSWORD2@
+defaultuser=@ACCOUNT2@
+callerid="@CID_NAME2@" <@EXT2@>
+mailbox=@EXT2@@default
+qualify=no
+directmedia=no
+dtmfmode=rfc2833
+disallow=all
+allow=ulaw
+;allow=g722
+
+# Phone Provision File entries
+[phoneprov]
+\#!version:1.0.0.1
+
+account.1.enable=1
+account.1.label=@EXT1@
+account.1.auth_name=@ACCOUNT1@
+account.1.user_name=@ACCOUNT1@
+account.1.password=@PASSWORD1@
+account.1.sip_server.1.address=@SIP_SERVER_IPV4@
+account.1.sip_server1.port=5060
+
+account.2.enable=1
+account.2.label=@EXT2@
+account.2.auth_name=@ACCOUNT2@
+account.2.user_name=@ACCOUNT2@
+account.2.password=@PASSWORD2@
+account.2.sip_server.1.address=@SIP_SERVER_IPV4@
+account.2.sip_server1.port=5060
+
+security.trust_certificates=0
+network.dhcp_host_name=@MODEL@-@EXT@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[6457] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2014-03-12 21:08:22

Revision: 6457
          http://sourceforge.net/p/astlinux/code/6457
Author:   abelbeck
Date:     2014-03-12 21:08:18 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
phoneprov-tools, add support for multiple dialplanN_file and dialplanN_context and [dialplanN] contexts in templates

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/phoneprov-massdeployment

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-12 20:54:32 UTC (rev 6456)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-12 21:08:18 UTC (rev 6457)
@@ -175,6 +175,9 @@
 DIALPLAN_DIR="/mnt/kd/asterisk/includes"
 SIP_DIR="/mnt/kd/asterisk/includes"
 
+DIALPLANS=(dialplan dialplan2 dialplan3 dialplan4 dialplan5 dialplan6)
+EXTENS=(exten exten2 exten3 exten4 exten5 exten6)
+
 case $if_name in
   INTIF)
     sip_server_if="$INTIF"
@@ -273,11 +276,13 @@
 if [ -z "$dialplan_path" ]; then
   dialplan_path="$DIALPLAN_DIR"
 fi
-dialplan_file="$(extract_var dialplan_file)"
-if [ -z "$dialplan_file" ]; then
-  dialplan_file="astlinux-phoneprov-exten.conf"
-fi
-dialplan_context="$(extract_var dialplan_context)"
+for d in ${!DIALPLANS[*]}; do
+  dialplan_file[$d]="$(extract_var ${DIALPLANS[$d]}_file)"
+  if [ -z "${dialplan_file[$d]}" ]; then
+    dialplan_file[$d]="astlinux-phoneprov-${EXTENS[$d]}.conf"
+  fi
+  dialplan_context[$d]="$(extract_var ${DIALPLANS[$d]}_context)"
+done
 sip_path="$(extract_var sip_path)"
 if [ -z "$sip_path" ]; then
   sip_path="$SIP_DIR"
@@ -290,22 +295,25 @@
 # Special case to initialize dialplan and sip output files
 if [ "$ext" = "init" -o "$ext" = "init-dialplan" -o "$ext" = "init-sip" ]; then
   if [ "$ext" = "init" -o "$ext" = "init-dialplan" ]; then
-    if is_context "dialplan" "$TEMPLATE_DIR/$template.conf"; then
-      exit_no_overwrite "$dialplan_path/$dialplan_file"
-      if [ ! -d "$dialplan_path" ]; then
-        mkdir -p "$dialplan_path"
-      fi
-      echo ";
+    for d in ${!DIALPLANS[*]}; do
+      if is_context "${DIALPLANS[$d]}" "$TEMPLATE_DIR/$template.conf"; then
+        exit_no_overwrite "$dialplan_path/${dialplan_file[$d]}"
+        if [ ! -d "$dialplan_path" ]; then
+          mkdir -p "$dialplan_path"
+        fi
+        echo ";
 ; ####################################################
 ; ### AstLinux auto-provisioned IP-Phone dialplan ####
 ; ####################################################
 ;
 ; Include in your extensions.conf file by using:
-; #include $dialplan_path/$dialplan_file
-${dialplan_context:+
-[$dialplan_context]}
-" > "$dialplan_path/$dialplan_file"
-    fi
+; #include $dialplan_path/${dialplan_file[$d]}
+" > "$dialplan_path/${dialplan_file[$d]}"
+        if [ -n "${dialplan_context[$d]}" ]; then
+          echo "[${dialplan_context[$d]}]" >> "$dialplan_path/${dialplan_file[$d]}"
+        fi
+      fi
+    done
   fi
   if [ "$ext" = "init" -o "$ext" = "init-sip" ]; then
     if is_context "sip" "$TEMPLATE_DIR/$template.conf"; then
@@ -353,29 +361,23 @@
 
 # main
 
-is_context_dialplan=0
-if is_context "dialplan" "$TEMPLATE_DIR/$template.conf"; then
-  is_context_dialplan=1
-fi
-is_context_sip=0
-if is_context "sip" "$TEMPLATE_DIR/$template.conf"; then
-  is_context_sip=1
-fi
 is_context_phoneprov=0
 if is_context "phoneprov" "$TEMPLATE_DIR/$template.conf"; then
   exit_no_overwrite "$prov_path/$prov_file"
   is_context_phoneprov=1
 fi
 
-if [ $is_context_dialplan -eq 1 ]; then
-  if [ ! -d "$dialplan_path" ]; then
-    mkdir -p "$dialplan_path"
+for d in ${!DIALPLANS[*]}; do
+  if is_context "${DIALPLANS[$d]}" "$TEMPLATE_DIR/$template.conf"; then
+    if [ ! -d "$dialplan_path" ]; then
+      mkdir -p "$dialplan_path"
+    fi
+    extract_context "${DIALPLANS[$d]}" "$TEMPLATE_DIR/$template.conf" | \
+      merge_variables | merge_indexed_variables >> "$dialplan_path/${dialplan_file[$d]}"
   fi
-  extract_context "dialplan" "$TEMPLATE_DIR/$template.conf" | \
-    merge_variables | merge_indexed_variables >> "$dialplan_path/$dialplan_file"
-fi
+done
 
-if [ $is_context_sip -eq 1 ]; then
+if is_context "sip" "$TEMPLATE_DIR/$template.conf"; then
   if [ ! -d "$sip_path" ]; then
     mkdir -p "$sip_path"
   fi

Modified: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-12 20:54:32 UTC (rev 6456)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-12 21:08:18 UTC (rev 6457)
@@ -48,14 +48,6 @@
   cat "$file" | sed -e 's/^#.*//' -e 's/\t/ /g' -e 's/ *$//' -e '/^$/d'
 }
 
-init_args() {
-  local args="$1" template
-
-  template="$(echo "$args" | awk -F' ' '{ print $1; }')"
-
-  echo "$template 00:00:00:00:00:00 init"
-}
-
 gen_pass() {
   local data="$1" template mac_addr ext_cid ext pass
 
@@ -160,23 +152,39 @@
 
 echo "Generating Phone Provisioning files:"
 
-if [ $partial -eq 1 ]; then
-  first=0
-else
+if [ $partial -eq 0 ]; then
   first=1
+  template_list=" "
+  IFS=$'\n'
+  extract_file "$in_file" | while read data; do
+    unset IFS
+    template="$(echo "$data" | awk -F' ' '{ print $1; }')"
+    if ! echo "$template_list" | grep -q " $template "; then
+      if [ $first -eq 1 ]; then
+        init="init"
+      else
+        init="init-dialplan"
+      fi
+      phoneprov-build $options $template 00:00:00:00:00:00 $init
+      result=$?
+      if [ $result -ne 0 ]; then
+        error_info $result
+        exit $result
+      fi
+      template_list="$template_list$template "
+      first=0
+    fi
+  done
+  result=$?
+  unset IFS
+  if [ $result -ne 0 ]; then
+    exit $result
+  fi
 fi
+
 IFS=$'\n'
 extract_file "$in_file" | while read data; do
   unset IFS
-  if [ $first -eq 1 ]; then
-    phoneprov-build $options $(init_args $data)
-    result=$?
-    if [ $result -ne 0 ]; then
-      error_info $result
-      exit $result
-    fi
-    first=0
-  fi
   phoneprov-build $options $data
   result=$?
   if [ $result -ne 0 ]; then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[6459] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2014-03-12 22:24:48

Revision: 6459
          http://sourceforge.net/p/astlinux/code/6459
Author:   abelbeck
Date:     2014-03-12 22:24:43 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
phoneprov-tools, add copyright and license info

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/phoneprov-massdeployment

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-12 21:42:32 UTC (rev 6458)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-12 22:24:43 UTC (rev 6459)
@@ -1,4 +1,15 @@
 #!/bin/bash
+##
+## Mass Deployment of IP Phones
+##
+## phoneprov-tools
+##
+## Copyright (C) 2014 Lonnie Abelbeck and Michael Keuter
+##
+## This is free software, licensed under the GNU General Public License
+## version 3 as published by the Free Software Foundation; you can
+## redistribute it and/or modify it under the terms of the GNU
+## General Public License; and comes with ABSOLUTELY NO WARRANTY.
 
 . /etc/rc.conf
 

Modified: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-12 21:42:32 UTC (rev 6458)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-03-12 22:24:43 UTC (rev 6459)
@@ -2,6 +2,14 @@
 ##
 ## Mass Deployment of IP Phones
 ##
+## phoneprov-tools
+##
+## Copyright (C) 2014 Lonnie Abelbeck and Michael Keuter
+##
+## This is free software, licensed under the GNU General Public License
+## version 3 as published by the Free Software Foundation; you can
+## redistribute it and/or modify it under the terms of the GNU
+## General Public License; and comes with ABSOLUTELY NO WARRANTY.
 
 usage()
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[6460] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2014-03-13 13:12:08

Revision: 6460
          http://sourceforge.net/p/astlinux/code/6460
Author:   abelbeck
Date:     2014-03-13 13:12:04 +0000 (Thu, 13 Mar 2014)
Log Message:
-----------
phoneprov-tools, minor tweaks

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-12 22:24:43 UTC (rev 6459)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-13 13:12:04 UTC (rev 6460)
@@ -313,9 +313,9 @@
           mkdir -p "$dialplan_path"
         fi
         echo ";
-; ####################################################
-; ### AstLinux auto-provisioned IP-Phone dialplan ####
-; ####################################################
+; ###################################################
+; ### AstLinux auto-provisioned IP-Phone dialplan ###
+; ###################################################
 ;
 ; Include in your extensions.conf file by using:
 ; #include $dialplan_path/${dialplan_file[$d]}
@@ -333,9 +333,9 @@
         mkdir -p "$sip_path"
       fi
       echo ";
-; ##############################################################
-; ### AstLinux auto-provisioned IP-Phone SIP configurations ####
-; ##############################################################
+; #############################################################
+; ### AstLinux auto-provisioned IP-Phone SIP configurations ###
+; #############################################################
 ;
 ; Include in your sip.conf file by using:
 ; #include $sip_path/$sip_file

Modified: branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2014-03-12 22:24:43 UTC (rev 6459)
+++ branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2014-03-13 13:12:04 UTC (rev 6460)
@@ -9,7 +9,8 @@
 prov_path=/mnt/kd/phoneprov/yealink
 prov_file=@MAC@.cfg
 macaddress_case=lower
-account_suffix=_@MAC4@_@MODEL@
+#auto_account_prefix=
+auto_account_suffix=_@MAC4@_@MODEL@
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[6474] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2014-03-21 15:22:06

Revision: 6474
          http://sourceforge.net/p/astlinux/code/6474
Author:   abelbeck
Date:     2014-03-21 15:22:04 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
phoneprov-tools, add 'auto_account_case=lower|upper' option to template [general] context

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/templates/snom320.conf
    branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
    branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
    branches/1.0/package/phoneprov-tools/templates/yealink.conf

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-20 19:40:53 UTC (rev 6473)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2014-03-21 15:22:04 UTC (rev 6474)
@@ -275,6 +275,16 @@
 auto_account_prefix="$(extract_var auto_account_prefix)"
 auto_account_suffix="$(extract_var auto_account_suffix)"
 
+auto_account_case="$(extract_var auto_account_case)"
+case $auto_account_case in
+  upper) auto_account_prefix="$(echo "$auto_account_prefix" | tr '[:lower:]' '[:upper:]')"
+         auto_account_suffix="$(echo "$auto_account_suffix" | tr '[:lower:]' '[:upper:]')"
+         ;;
+  lower) auto_account_prefix="$(echo "$auto_account_prefix" | tr '[:upper:]' '[:lower:]')"
+         auto_account_suffix="$(echo "$auto_account_suffix" | tr '[:upper:]' '[:lower:]')"
+         ;;
+esac
+
 prov_path="$(extract_var prov_path)"
 if [ -z "$prov_path" ]; then
   prov_path="$PHONEPROV_DIR/$vendor"

Modified: branches/1.0/package/phoneprov-tools/templates/snom320.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-03-20 19:40:53 UTC (rev 6473)
+++ branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-03-21 15:22:04 UTC (rev 6474)
@@ -11,6 +11,7 @@
 macaddress_case=upper
 #auto_account_prefix=
 auto_account_suffix=_@MAC4@_@MODEL@
+auto_account_case=lower
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf

Modified: branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2014-03-20 19:40:53 UTC (rev 6473)
+++ branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2014-03-21 15:22:04 UTC (rev 6474)
@@ -11,6 +11,7 @@
 macaddress_case=lower
 #auto_account_prefix=
 auto_account_suffix=_@MAC4@_@MODEL@
+#auto_account_case=lower
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf

Modified: branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2014-03-20 19:40:53 UTC (rev 6473)
+++ branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2014-03-21 15:22:04 UTC (rev 6474)
@@ -11,6 +11,7 @@
 macaddress_case=lower
 #auto_account_prefix=
 auto_account_suffix=_@MAC4@_@MODEL@
+#auto_account_case=lower
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf

Modified: branches/1.0/package/phoneprov-tools/templates/yealink.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-03-20 19:40:53 UTC (rev 6473)
+++ branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-03-21 15:22:04 UTC (rev 6474)
@@ -11,6 +11,7 @@
 macaddress_case=lower
 #auto_account_prefix=
 auto_account_suffix=_@MAC4@_@MODEL@
+#auto_account_case=lower
 
 #dialplan_path=/mnt/kd/asterisk/includes
 dialplan_file=astlinux-phoneprov-exten.conf

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[6578] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2014-07-02 17:56:30

Revision: 6578
          http://sourceforge.net/p/astlinux/code/6578
Author:   abelbeck
Date:     2014-07-02 17:56:21 +0000 (Wed, 02 Jul 2014)
Log Message:
-----------
phoneprov-tools, add template option 'sql_enable' which defaults to 'yes', use table 'phoneprov_build' and then later rename it to 'phoneprov' so it is not half-baked on slow systems

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
    branches/1.0/package/phoneprov-tools/templates/gxp1400.conf
    branches/1.0/package/phoneprov-tools/templates/snom320.conf
    branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
    branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
    branches/1.0/package/phoneprov-tools/templates/yealink.conf

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2014-07-02 17:56:21 UTC (rev 6578)
@@ -157,8 +157,8 @@
 sql_init()
 {
   sqlite3 -batch "$ASTERISK_ODBC_SQLITE3" <<EOF
-DROP TABLE IF EXISTS 'phoneprov';
-CREATE TABLE 'phoneprov' (
+DROP TABLE IF EXISTS 'phoneprov_build';
+CREATE TABLE 'phoneprov_build' (
   'id' INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
   'ext' TEXT DEFAULT '',
   'cid_name' TEXT DEFAULT '',
@@ -178,7 +178,7 @@
   for i in 1 2 3 4 5 6; do
     # Only add unique extensions
     if [ "$i" = "1" -o "${EXT[$i]}" != "$ext" ]; then
-      echo "INSERT INTO 'phoneprov' (
+      echo "INSERT INTO 'phoneprov_build' (
 'ext',
 'cid_name',
 'account',
@@ -373,6 +373,12 @@
 if [ -z "$sip_file" ]; then
   sip_file="astlinux-phoneprov-sip.conf"
 fi
+sql_enable="$(extract_var sql_enable)"
+if [ -z "$sql_enable" ]; then
+  sql_enable="yes"
+else
+  sql_enable="$(echo "$sql_enable" | tr '[:upper:]' '[:lower:]')"
+fi
 
 # Special case to initialize dialplan and sip output files
 if [ "$ext" = "init" -o "$ext" = "init-dialplan" -o "$ext" = "init-sip" ]; then
@@ -416,7 +422,9 @@
   fi
 
   # Initialize SQL table entry
-  sql_init
+  if [ "$sql_enable" = "yes" ]; then
+    sql_init
+  fi
   exit 0
 fi
 
@@ -481,6 +489,8 @@
 fi
 
 # Add SQL table entry
-sql_add
+if [ "$sql_enable" = "yes" ]; then
+  sql_add
+fi
 
 exit 0

Modified: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-07-02 17:56:21 UTC (rev 6578)
@@ -80,6 +80,27 @@
   fi
 }
 
+sql_apply() {
+  local ASTERISK_ODBC_SQLITE3 phoneprov_build
+
+  ASTERISK_ODBC_SQLITE3="/mnt/kd/asterisk-odbc.sqlite3"
+
+  phoneprov_build=$(sqlite3 -batch "$ASTERISK_ODBC_SQLITE3" <<EOF
+SELECT count(*) FROM sqlite_master WHERE type='table' AND name='phoneprov_build';
+EOF
+  )
+  if [ "$phoneprov_build" = "1" ]; then
+    sqlite3 -batch "$ASTERISK_ODBC_SQLITE3" <<EOF
+DROP TABLE IF EXISTS 'phoneprov';
+ALTER TABLE 'phoneprov_build' RENAME TO 'phoneprov';
+EOF
+  else
+    sqlite3 -batch "$ASTERISK_ODBC_SQLITE3" <<EOF
+DROP TABLE IF EXISTS 'phoneprov';
+EOF
+  fi
+}
+
 ARGS="$(getopt --name phoneprov-massdeployment \
                --long auto-pass,only-pass,force-overwrite,help,if-name:,partial,auto-reload,only-reload \
                --options aAfhi:prR \
@@ -201,6 +222,8 @@
   exit $result
 fi
 
+sql_apply
+
 echo "Done"
 
 if [ $auto_reload -eq 1 ]; then

Modified: branches/1.0/package/phoneprov-tools/templates/gxp1400.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/gxp1400.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/gxp1400.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -35,6 +35,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries:
 # Exten-intern
 [dialplan]

Modified: branches/1.0/package/phoneprov-tools/templates/snom320.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -27,6 +27,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries
 [dialplan]
 exten => @EXT@,1,Dial(SIP/@ACCOUNT@)

Modified: branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -28,6 +28,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries
 [dialplan]
 exten => @EXT@,1,Dial(SIP/@ACCOUNT@)

Modified: branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -29,6 +29,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries
 [dialplan]
 exten => @EXT1@,1,Dial(SIP/@ACCOUNT1@)

Modified: branches/1.0/package/phoneprov-tools/templates/yealink.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -29,6 +29,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries
 [dialplan]
 exten => @EXT@,1,Dial(SIP/@ACCOUNT@)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7177] branches/1.0/package/phoneprov-tools

From: <abe...@us...> - 2015-08-04 21:37:47

Revision: 7177
          http://sourceforge.net/p/astlinux/code/7177
Author:   abelbeck
Date:     2015-08-04 21:37:45 +0000 (Tue, 04 Aug 2015)
Log Message:
-----------
phoneprov-tools, add a 'sip_driver' column to the SQL table to indicate sip vs. pjsip for each template

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/templates/gxp1400.conf
    branches/1.0/package/phoneprov-tools/templates/snom320.conf
    branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
    branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
    branches/1.0/package/phoneprov-tools/templates/yealink.conf

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2015-08-04 21:37:45 UTC (rev 7177)
@@ -167,7 +167,8 @@
   'mac_addr' TEXT DEFAULT '',
   'template' TEXT DEFAULT '',
   'model' TEXT DEFAULT '',
-  'vendor' TEXT DEFAULT ''
+  'vendor' TEXT DEFAULT '',
+  'sip_driver' TEXT DEFAULT ''
 );
 EOF
 }
@@ -186,7 +187,8 @@
 'mac_addr',
 'template',
 'model',
-'vendor'
+'vendor',
+'sip_driver'
 )
 VALUES (
 '${EXT[$i]}',
@@ -196,7 +198,8 @@
 '${mac_addr}',
 '${template}',
 '${model}',
-'${vendor}'
+'${vendor}',
+'${sip_driver}'
 );"
     fi
   done
@@ -387,6 +390,12 @@
 else
   sql_enable="$(echo "$sql_enable" | tr '[:upper:]' '[:lower:]')"
 fi
+sip_driver="$(extract_var sip_driver)"
+if [ -z "$sip_driver" ]; then
+  sip_driver="sip"
+else
+  sip_driver="$(echo "$sip_driver" | tr '[:upper:]' '[:lower:]')"
+fi
 
 # Special case to initialize dialplan and sip output files
 if [ "$ext" = "init" -o "$ext" = "init-dialplan" -o "$ext" = "init-sip" ]; then

Modified: branches/1.0/package/phoneprov-tools/templates/gxp1400.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/gxp1400.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/gxp1400.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -36,6 +36,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries:
 # Exten-intern

Modified: branches/1.0/package/phoneprov-tools/templates/snom320.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/snom320.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/snom320.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -28,6 +28,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries
 [dialplan]

Modified: branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -29,6 +29,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries
 [dialplan]

Modified: branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -30,6 +30,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries
 [dialplan]

Modified: branches/1.0/package/phoneprov-tools/templates/yealink.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/yealink.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -30,6 +30,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries
 [dialplan]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.