From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 8 Feb 2015 18:13:39 +0000 (+0100)
Subject: Merge pull request #305 from nmav/compression
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=cd24ad05a4a87e5bb37a64a26a72e609b523c640;hp=-c

Merge pull request #305 from nmav/compression

luci-app-ocserv: Added option to enable compression
---

cd24ad05a4a87e5bb37a64a26a72e609b523c640
diff --combined applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
index 23f6f5c84,ef0e53daf..d1cc155fa
--- a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
+++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
@@@ -42,7 -42,7 +42,7 @@@ if fd then local l
  			found_pki = true
  		elseif found_pki then
  			local hash = ln:match("([a-f0-9]+)")
 -			o_pki.default = hash and hash:upper()
 +			o_pki.default = hash and "sha1:" .. hash:upper()
  			complete = complete + 1
  			found_pki = false
  		end
@@@ -90,6 -90,10 +90,10 @@@ local pip = s:taboption("general", Flag
  	translate("The assigned IPs will be selected deterministically"))
  pip.default = "1"
  
+ local compr = s:taboption("general", Flag, "compression", translate("Enable compression"),
+ 	translate("Enable compression"))
+ compr.default = "1"
+ 
  local udp = s:taboption("general", Flag, "udp", translate("Enable UDP"),
  	translate("Enable UDP channel support; this must be enabled unless you know what you are doing"))
  udp.default = "1"