owsd: update to new version with ubus list

Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
This commit is contained in:
Denis Osvald 2016-04-29 18:00:02 +02:00 committed by Sukru Senli
parent e593c613f2
commit ea2abe2723
3 changed files with 12 additions and 9 deletions

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=owsd
PKG_VERSION:=0.93
PKG_VERSION:=0.94
PKG_RELEASE:=1
PKG_SOURCE_PROTO=git
PKG_SOURCE_URL:=git@public.inteno.se:owsd.git
PKG_SOURCE_VERSION:=d9c78ec39c2f8d65f0f64cfa9bcf45efe9cc38cb
PKG_SOURCE_VERSION:=18825d54a38d137fb26f418d1d2f7bb2991eaf89
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>
@ -32,7 +32,7 @@ endef
define Package/owsd-testdata
$(call Package/owsd)
TITLE += (Test certs and rpcd ACLs for running automated tests)
DEPENDS := owsd
DEPENDS := owsd +rpcd-mod-file
endef
define Package/owsd/description

View file

@ -1,9 +1,9 @@
config owsd 'setup'
#option sock '/var/run/ubus.sock'
#option port '8843'
list origin 'http://localhost/'
list origin 'http://localhost:80/'
list origin 'http://localhost:8080/'
list origin 'http://192.168.1.1:8843'
list origin 'https://192.168.1.1:8843'
#option cert '/usr/share/owsD/cert.pem'
#option key '/usr/share/owsD/key.pem'
#option www '/www'

View file

@ -13,7 +13,9 @@ validate_owsd() {
'port:integer' \
'origin:list(string)' \
'cert:string' \
'key:string'
'key:string' \
'www:string' \
}
append_origin() {
@ -33,8 +35,9 @@ start_service() {
[ -n "${sock}" ] && procd_append_param command -s "${sock}"
[ -n "${port}" ] && procd_append_param command -p "${port}"
config_list_foreach "setup" "origin" append_origin
[ -n "${cert}" ] && procd_append_param command -C "${cert}"
[ -n "${key}" ] && procd_append_param command -K "${key}"
[ -n "${cert}" ] && procd_append_param command -c "${cert}"
[ -n "${key}" ] && procd_append_param command -k "${key}"
[ -n "${www}" ] && procd_append_param command -w "${www}"
# procd_set_param stderr 1
procd_set_param respawn