luci-app-ocserv: move to new vpn menu section

Move the app ocserv to the new vpn menu section.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

diff --git a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
index 79c6ddb78e12040a63e646e608945f7bf325d6d0..f41b4810380dd9c7849d9861574b886acee24a7c 100644 (file)
--- a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
+++ b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
@@ -10,24 +10,24 @@ function index()
 
        local page
 
-       page = entry({"admin", "services", "ocserv"}, alias("admin", "services", "ocserv", "main"),
+       page = entry({"admin", "vpn", "ocserv"}, alias("admin", "vpn", "ocserv", "main"),
                _("OpenConnect VPN"))
        page.dependent = true
        
-       page = entry({"admin", "services", "ocserv", "main"},
+       page = entry({"admin", "vpn", "ocserv", "main"},
                cbi("ocserv/main"),
                _("Server Settings"), 200)
        page.dependent = true
 
-       page = entry({"admin", "services", "ocserv", "users"},
+       page = entry({"admin", "vpn", "ocserv", "users"},
                cbi("ocserv/users"),
                _("User Settings"), 300)
        page.dependent = true
 
-       entry({"admin", "services", "ocserv", "status"},
+       entry({"admin", "vpn", "ocserv", "status"},
                call("ocserv_status")).leaf = true
 
-       entry({"admin", "services", "ocserv", "disconnect"},
+       entry({"admin", "vpn", "ocserv", "disconnect"},
                post("ocserv_disconnect")).leaf = true
 
 end

diff --git a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
index 9c69514b9598ff200b7bdbedd8db63ec9f094b3a..d00084a0bc45b0b38aed6c837fda5783159b6464 100644 (file)
--- a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
+++ b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
@@ -1,7 +1,7 @@
 <script type="text/javascript">//<![CDATA[
 
        function ocserv_disconnect(idx) {
-               (new XHR()).post('<%=url('admin/services/ocserv/disconnect')%>/' + idx, { token: '<%=token%>' },
+               (new XHR()).post('<%=url('admin/vpn/ocserv/disconnect')%>/' + idx, { token: '<%=token%>' },
                        function(x)
                        {
                                var tb = document.getElementById('ocserv_status_table');
@@ -11,7 +11,7 @@
                );
        }
 
-       XHR.poll(-1, '<%=url('admin/services/ocserv/status')%>', null,
+       XHR.poll(-1, '<%=url('admin/vpn/ocserv/status')%>', null,
                function(x, st)
                {
                        var tb = document.getElementById('ocserv_status_table');