Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

asterisk-chan-sccp: improve package

Browse source 
- remove some whitespaces
- install only the configuration example from the source instead of the
  locally kept files (which are probably outdated anyway)
- add a comment explaining the iostream hack
- use proper install routine instead of "$(CP)"

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-11-26 23:12:21 +01:00
parent 021d3fdd9c
commit 3a7ddeaccd
6 changed files with 7 additions and 281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
net/asterisk-chan-sccp/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=chan-sccp
PKG_VERSION:=v4.3.0-20171123
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
@ -50,14 +50,14 @@ endef
define Package/asterisk13-chan-sccp
$(call Package/chan-sccp/Default)
DEPENDS+= asterisk13
DEPENDS+=asterisk13
VARIANT:=asterisk13
CONFLICTS:=asterisk13-chan-skinny
endef
define Package/asterisk15-chan-sccp
$(call Package/chan-sccp/Default)
DEPENDS+= asterisk15
DEPENDS+=asterisk15
VARIANT:=asterisk15
CONFLICTS:=asterisk15-chan-skinny
endef
@ -87,15 +87,14 @@ endif
define Package/conffiles/Default
/etc/asterisk/sccp.conf
/etc/asterisk/extconfig.conf.sccp_sample
/etc/asterisk/res_config_sqlite3.conf.sccp_sample
/etc/asterisk/sccp_sqlite3.sql
/etc/asterisk/sccp.conf.realtime_sample
endef
Package/asterisk13-chan-sccp/conffiles = $(Package/conffiles/Default)
Package/asterisk15-chan-sccp/conffiles = $(Package/conffiles/Default)
# Asterisk 13 gets mistaken for Asterisk 15 because it was patched to include
# iostream support. To get it detected correctly make it impossible for the
# build system to find the iostream header.
define Build/Prepare
$(call Build/Prepare/Default)
ifeq ($(BUILD_VARIANT),asterisk13)
@ -106,13 +105,9 @@ endef
define Package/Install/Default
$(INSTALL_DIR) $(1)/etc/asterisk
$(CP) ./files/sccp.conf $(1)/etc/asterisk/sccp.conf
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/asterisk/sccp.conf $(1)/etc/asterisk
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/
$(INSTALL_DATA) ./files/extconfig.conf.sccp_sample $(1)/etc/asterisk/extconfig.conf.sccp_sample
$(INSTALL_DATA) ./files/res_config_sqlite3.conf.sccp_sample $(1)/etc/asterisk/res_config_sqlite3.conf.sccp_sample
$(INSTALL_DATA) ./files/sccp_sqlite3.sql $(1)/etc/asterisk/sccp_sqlite3.sql
$(INSTALL_DATA) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample
endef
Package/asterisk13-chan-sccp/install = $(Package/Install/Default)

3
net/asterisk-chan-sccp/files/extconfig.conf.sccp_sample
View file

@ -1,3 +0,0 @@
[settings]
sccpdevice => sqlite3,asterisk,sccpdeviceconfig
sccpline => sqlite3,asterisk,sccpline

5
net/asterisk-chan-sccp/files/res_config_sqlite3.conf.sccp_sample
View file

@ -1,5 +0,0 @@
[asterisk]
dbfile => /usr/lib/asterisk/realtime.sqlite3
debug=yes
requirements=warn
;batch=1000

108
net/asterisk-chan-sccp/files/sccp.conf
View file

@ -1,108 +0,0 @@
[general]
servername = Openwrt
keepalive = 60
debug = core
context = default
dateformat = D/M/Y
bindaddr = ::
port = 2000
disallow = all
allow = ulaw
allow = alaw
allow = gsm
firstdigittimeout = 16
digittimeout = 6
autoanswer_ring_time = 1
transfer_on_hangup = off
musicclass = default
language = en
deny = 0.0.0.0/0.0.0.0
permit = internal
dndFeature = on
echocancel = off
silencesuppression = off
hotline_enabled = yes
hotline_context = default
hotline_extension = 111
[SEP001122334455]
type = device
description = Phone Number One
devicetype = 7970
#addon = 7915, 7915
button = line, 111
button = line, 113@01:shared
button = speeddial,Phone 2 Line 1, 112, 112@hint
deny = 0.0.0.0/0.0.0.0
permit = internal
disallow = all
#allow = g722
#allow = g729
allow = ulaw
allow = alaw
allow = gsm
directrtp = on
[SEP00A1B2C3D4E5]
type = device
description = Phone Number Two
devicetype = 7960
button = line, 112
button = line, 113@01:shared
button = speeddial,Phone 1 Line 1, 111, 111@hint
directrtp = on
[111]
id = 1000
type = line
pin = 1234
context = default
label = Phone 1 Line 1
description = Line 111
mailbox = 10111
cid_name = Phone 1 CID
cid_num = 111
accountcode=79111
callgroup=1
pickupgroup=1
context = default
incominglimit = 2
vmnum = 600
trnsfvm = 1000
[112]
id = 1001
type = line
pin = 1234
context = default
label = Phone 2 Line 1
description = Line 112
mailbox = 10112
cid_name = Phone 2 CID
cid_num = 112
accountcode=79112
callgroup=1,2
pickupgroup=1,2
context = default
incominglimit = 4
vmnum = 600
trnsfvm = 1000
[113]
id = 1002
type = line
pin = 5522
context = default
label = SharedLine 1
description = Line 113
mailbox = 10113
cid_name = Shared
cid_num = 113
accountcode=79113
incominglimit = 2
callgroup=2
pickupgroup=2
vmnum = 600
trnsfvm = 1000
dnd = silent

30
net/asterisk-chan-sccp/files/sccp.conf.realtime_sample
View file

@ -1,30 +0,0 @@
[general]
servername = Openwrt
keepalive = 60
debug = core
context = default
dateformat = D/M/Y
bindaddr = ::
port = 2000
disallow = all
allow = ulaw
allow = alaw
allow = g729
firstdigittimeout = 16
digittimeout = 6
autoanswer_ring_time = 1
transfer_on_hangup = off
musicclass = default
language = en
deny = 0.0.0.0/0.0.0.0
permit = internal
dndFeature = on
echocancel = off
silencesuppression = off
hotline_enabled = yes
hotline_context = default
hotline_extension = 111
devicetable = sccpdevice
linetable = sccpline

123
net/asterisk-chan-sccp/files/sccp_sqlite3.sql
View file

@ -1,123 +0,0 @@
/*
* this is for users how like to sepatet device and button configuration
* You have to change the table names to:
*
* sccpdevices -> sccpdeviceconfig
* sccplines -> sccpline
*/
PRAGMA auto_vacuum=2;
--
-- Table with line-configuration
--
CREATE TABLE sccpdevice (
type varchar(45) DEFAULT NULL,
addon varchar(45) DEFAULT NULL,
description varchar(45) DEFAULT NULL,
tzoffset varchar(5) DEFAULT NULL,
transfer varchar(5) DEFAULT 'on',
cfwdall varchar(5) DEFAULT 'on',
cfwdbusy varchar(5) DEFAULT 'on',
imageversion varchar(45) DEFAULT NULL,
deny varchar(45) DEFAULT NULL,
permit varchar(45) DEFAULT NULL,
dndFeature varchar(5) DEFAULT 'on',
directrtp varchar(3) DEFAULT 'off',
earlyrtp varchar(8) DEFAULT 'off',
mwilamp varchar(5) DEFAULT 'on',
mwioncall varchar(5) DEFAULT 'off',
pickupexten varchar(5) DEFAULT 'on',
pickupcontext varchar(100) DEFAULT '',
pickupmodeanswer varchar(5) DEFAULT 'on',
private varchar(5) DEFAULT 'off',
privacy varchar(100) DEFAULT 'full',
nat varchar(4) DEFAULT 'auto',
softkeyset varchar(100) DEFAULT '',
audio_tos varchar(11) DEFAULT NULL,
audio_cos varchar(1) DEFAULT NULL,
video_tos varchar(11) DEFAULT NULL,
video_cos varchar(1) DEFAULT NULL,
conf_allow varchar(3) DEFAULT 'on',
conf_play_general_announce varchar(3) DEFAULT 'on',
conf_play_part_announce varchar(3) DEFAULT 'on',
conf_mute_on_entry varchar(3) DEFAULT 'off',
conf_music_on_hold_class varchar(80) DEFAULT 'default',
conf_show_conflist varchar(3) DEFAULT 'on',
backgroundImage varchar(255) DEFAULT '',
ringtone varchar(255) DEFAULT '',
setvar varchar(100) DEFAULT NULL,
disallow varchar(255) DEFAULT NULL,
allow varchar(255) DEFAULT NULL,
name varchar(15) NOT NULL DEFAULT '',
PRIMARY KEY (name)
);
--
-- Table with device-configuration
--
CREATE TABLE sccpline (
id varchar(4) DEFAULT NULL,
pin varchar(45) DEFAULT NULL,
label varchar(45) DEFAULT NULL,
description varchar(45) DEFAULT NULL,
context varchar(45) DEFAULT NULL,
incominglimit varchar(45) DEFAULT NULL,
transfer varchar(45) DEFAULT NULL,
mailbox varchar(45) DEFAULT NULL,
vmnum varchar(45) DEFAULT NULL,
cid_name varchar(45) DEFAULT NULL,
cid_num varchar(45) DEFAULT NULL,
trnsfvm varchar(45) DEFAULT NULL,
secondary_dialtone_digits varchar(45) DEFAULT NULL,
secondary_dialtone_tone varchar(45) DEFAULT NULL,
musicclass varchar(45) DEFAULT NULL,
language varchar(45) DEFAULT NULL,
accountcode varchar(45) DEFAULT NULL,
echocancel varchar(45) DEFAULT NULL,
silencesuppression varchar(45) DEFAULT NULL,
callgroup varchar(45) DEFAULT NULL,
pickupgroup varchar(45) DEFAULT NULL,
namedcallgroup varchar(45) DEFAULT NULL,
namedpickupgroup varchar(45) DEFAULT NULL,
dnd varchar(7) DEFAULT 'reject',
amaflags varchar(45) DEFAULT NULL,
defaultSubscriptionId_number varchar(5) DEFAULT NULL,
setvar varchar(50) DEFAULT NULL,
name varchar(45) NOT NULL DEFAULT '',
PRIMARY KEY (name)
);
CREATE TABLE buttontype (
type varchar(9) DEFAULT NULL,
PRIMARY KEY (type)
);
INSERT INTO buttontype (type) VALUES ('line');
INSERT INTO buttontype (type) VALUES ('speeddial');
INSERT INTO buttontype (type) VALUES ('service');
INSERT INTO buttontype (type) VALUES ('feature');
INSERT INTO buttontype (type) VALUES ('empty');
--
-- Table with button-configuration for device
--
CREATE TABLE buttonconfig (
device varchar(15) NOT NULL DEFAULT '',
instance tinyint(4) NOT NULL DEFAULT '0',
type varchar(9),
name varchar(36) DEFAULT NULL,
options varchar(100) DEFAULT NULL,
PRIMARY KEY (device,instance),
FOREIGN KEY (device) REFERENCES sccpdevice (device),
FOREIGN KEY (type) REFERENCES buttontype (type)
);
--
-- View for merging device and button configuration
--
CREATE VIEW sccpdeviceconfig AS
SELECT sccpdevice.*,
group_concat(buttonconfig.type||","||buttonconfig.name||","||buttonconfig.options,";") as button
FROM buttonconfig, sccpdevice
WHERE buttonconfig.device=sccpdevice.name
GROUP BY sccpdevice.name
ORDER BY sccpdevice.name, buttonconfig.instance;