From 44e10992bf0138eb67b4a81f265dbba351d9b43c Mon Sep 17 00:00:00 2001
From: Denis Osvald <denis.osvald@sartura.hr>
Date: Fri, 10 Feb 2017 14:13:59 +0100
Subject: [PATCH] Update feed [ feed_inteno_packages ] package [ owsd ]

-------------------------------------------------------------------------------
* 20fef42 make HTTP caching configurable and off-by-default
-------------------------------------------------------------------------------

-------------------------------------------------------------------------------
commit 20fef420d1796b47fb056e98113592471011a9de
Author: Denis Osvald <denis.osvald@sartura.hr>
Date: 2017-02-10 13:53:44 +0100

    make HTTP caching configurable and off-by-default

    Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>

Base directory -> /
 src/main.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
-------------------------------------------------------------------------------

Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
---
 owsd/Makefile          | 4 ++--
 owsd/files/owsd.config | 1 +
 owsd/files/owsd.init   | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/owsd/Makefile b/owsd/Makefile
index a6a75c1db..513a6af1d 100644
--- a/owsd/Makefile
+++ b/owsd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=owsd
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=http://public.inteno.se/owsd.git
-PKG_SOURCE_VERSION:=f17bb09f8fff087a9b2c48ee84af67540d90516f
+PKG_SOURCE_VERSION:=20fef420d1796b47fb056e98113592471011a9de
 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>
diff --git a/owsd/files/owsd.config b/owsd/files/owsd.config
index 3deb08591..d32cbd04c 100644
--- a/owsd/files/owsd.config
+++ b/owsd/files/owsd.config
@@ -2,6 +2,7 @@ config owsd 'global'
 	option sock '/var/run/ubus.sock'
 	option www '/www'
 	option redirect '/cgi-bin/luci:/cacheflush.html'
+#	option www_maxage '3600'
 #	list ubusproxy 'https://repeater1url/'
 #	list ubusproxy 'ws://repeater2url/'
 #	option client_cert '/etc/ssl/certs/owsd-repeater-control-cert.pem'
diff --git a/owsd/files/owsd.init b/owsd/files/owsd.init
index 942c1c19b..0de12a990 100644
--- a/owsd/files/owsd.init
+++ b/owsd/files/owsd.init
@@ -34,6 +34,7 @@ validate_owsd() {
 		'sock:string' \
 		'redirect:string' \
 		'www:string' \
+		'www_maxage:integer' \
 		'ubusproxy:list(string)' \
 		'client_key:file' \
 		'client_cert:file' \
@@ -158,7 +159,7 @@ start_service() {
 	procd_open_instance
 	procd_set_param command $PROG
 
-	local sock www redirect
+	local sock www redirect www_maxage
 	local client_cert client_key client_ca
 
 	validate_owsd || {
@@ -169,6 +170,7 @@ start_service() {
 	[ -n "${sock}"      ] && procd_append_param command -s"${sock}"
 	[ -n "${www}"       ] && procd_append_param command -w"${www}"
 	[ -n "${redirect}"  ] && procd_append_param command -r"${redirect}"
+	[ -n "${www_maxage}" ] && procd_append_param command -t"${www_maxage}"
 
 	[ -n "${client_cert}" ] && procd_append_param command -C"${client_cert}"
 	[ -n "${client_key}"  ] && procd_append_param command -K"${client_key}"