Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1481 from TDT-AG/luci-app-openvpn-fixes

Browse source 
luci-app-openvpn: several fixes
This commit is contained in:
Jo-Philipp Wich 2018-05-25 07:22:27 +02:00 committed by GitHub
commit c181699bf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
View file

@ -56,7 +56,7 @@ function s.create(self, name)
luci.cbi.CREATE_PREFIX .. self.config .. "." ..
self.sectiontype .. ".text"
)
if string.len(name)>3 and not name:match("[^a-zA-Z0-9_]") then
if #name > 3 and not name:match("[^a-zA-Z0-9_]") then
uci:section(
"openvpn", "openvpn", name,
uci:get_all( "openvpn_recipes", recipe )
@ -67,9 +67,11 @@ function s.create(self, name)
uci:save("openvpn")
luci.http.redirect( self.extedit:format(name) )
else
elseif #name > 0 then
self.invalid_cts = true
end
return 0
end
@ -103,10 +105,7 @@ function updown.cfgvalue(self, section)
end
function updown.write(self, section, value)
if self.option == "stop" then
local pid = s.getPID(section)
if pid ~= nil then
sys.process.signal(pid,15)
end
luci.sys.call("/etc/init.d/openvpn stop %s" % section)
else
luci.sys.call("/etc/init.d/openvpn start %s" % section)
end
@ -126,5 +125,8 @@ function proto.cfgvalue(self, section)
return val or "udp"
end
function m.on_after_commit(self,map)
require("luci.sys").call('/etc/init.d/openvpn reload')
end
return m