mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
owsd: update to version with client proxy
New version adds option -C to owsd, with respective option in config: config owsd 'global' ... list ubusproxy 'http://url1/' list ubusproxy 'http://url12/' ... Patch is removed since it's obsoleted in this version Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
This commit is contained in:
parent
2f8768beaa
commit
5f729b9eea
4 changed files with 11 additions and 15 deletions
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=owsd
|
||||
PKG_VERSION:=1.0.5
|
||||
PKG_VERSION:=1.0.990
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO=git
|
||||
PKG_SOURCE_URL:=http://public.inteno.se/owsd.git
|
||||
PKG_SOURCE_VERSION:=40a0aaf993d16e22be37ea86ec6eb27f48998c0d
|
||||
PKG_SOURCE_VERSION:=1ed6f735009a80aa8eaca95efd466cbb841e8d99
|
||||
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>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ config owsd 'global'
|
|||
option sock '/var/run/ubus.sock'
|
||||
option www '/www'
|
||||
option redirect '/cgi-bin/luci:/cacheflush.html'
|
||||
# list ubusproxy 'http://repeater1url/'
|
||||
# list ubusproxy 'ws://repeater2url/'
|
||||
|
||||
config owsd-listen 'loopback'
|
||||
option port '80'
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ validate_owsd() {
|
|||
uci_validate_section "owsd" "owsd" "global" \
|
||||
'sock:string' \
|
||||
'redirect:string' \
|
||||
'ubusproxy:list(string)' \
|
||||
'www:string'
|
||||
}
|
||||
|
||||
|
|
@ -157,6 +158,12 @@ start_service() {
|
|||
[ -n "${www}" ] && procd_append_param command -w"${www}"
|
||||
[ -n "${redirect}" ] && procd_append_param command -r"${redirect}"
|
||||
|
||||
append_ubusproxy () {
|
||||
[ -n "$1" ] && procd_append_param command -C"$1"
|
||||
}
|
||||
|
||||
config_list_foreach "global" "ubusproxy" append_ubusproxy
|
||||
|
||||
config_foreach parse_owsd_iface "owsd-listen"
|
||||
|
||||
# procd_set_param stderr 1
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/main.c b/src/main.c
|
||||
index 4d875b5..3bcc54e 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -42,7 +42,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef WSD_MAX_VHOSTS
|
||||
-#define WSD_MAX_VHOSTS 10
|
||||
+#define WSD_MAX_VHOSTS 30
|
||||
#endif
|
||||
|
||||
struct prog_context global;
|
||||
Loading…
Add table
Reference in a new issue