X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-ocserv%2Fluasrc%2Fmodel%2Fcbi%2Focserv%2Fmain.lua;h=d87d126972344af59b8d425ae2ed01fd10219d89;hp=c4289f0520b88ca55b846466d664604b77ce7666;hb=64c026cb64a00d2b4bdcdedec2a78e5e16296259;hpb=1bb4822dca6113f73e3bc89e2acf15935e6f8e92

diff --git a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
index c4289f052..d87d12697 100644
--- a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
+++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
@@ -1,15 +1,5 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2014 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-]]--
+-- Copyright 2014 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
+-- Licensed to the public under the Apache License 2.0.
 
 local fs = require "nixio.fs"
 local has_ipv6 = fs.access("/proc/net/ipv6_route")
@@ -52,7 +42,7 @@ if fd then local ln
 			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
@@ -84,12 +74,6 @@ o.default = "plain"
 o:value("plain")
 o:value("PAM")
 
-o = s:taboption("general", Value, "zone", translate("Firewall Zone"),
-	translate("The firewall zone that the VPN clients will be set to"))
-o.nocreate = true
-o.default = "lan"
-o.template = "cbi/firewall_zonelist"
-
 s:taboption("general", Value, "port", translate("Port"),
 	translate("The same UDP and TCP ports will be used"))
 s:taboption("general", Value, "max_clients", translate("Max clients"))
@@ -100,6 +84,10 @@ local pip = s:taboption("general", Flag, "predictable_ips", translate("Predictab
 	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"