summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2008-02-06 08:40:23 +0000
committerMika Havela <mika.havela@gmail.com>2008-02-06 08:40:23 +0000
commitd619a9cafd514e7fcf9ccd522c85c516569f49d9 (patch)
treebdbd0af25313d809a3690ea1a4e088c6f2933dcc
parentd976e45d7381ee14f69831eb3f886f8237810259 (diff)
downloadacf-openvpn-d619a9cafd514e7fcf9ccd522c85c516569f49d9.tar.bz2
acf-openvpn-d619a9cafd514e7fcf9ccd522c85c516569f49d9.tar.xz
Renamed read to status.
git-svn-id: svn://svn.alpinelinux.org/acf/openvpn/trunk@697 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--Makefile2
-rw-r--r--openvpn-controller.lua5
-rw-r--r--openvpn-status-html.lsp (renamed from openvpn-read-html.lsp)0
-rw-r--r--openvpn.menu2
4 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7296c8c..610c311 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ APP_DIST=openvpn-client_config-html.lsp \
openvpn-logfile-html.lsp \
openvpn-model.lua \
openvpn-pem_info-html.lsp \
- openvpn-read-html.lsp \
+ openvpn-status-html.lsp \
openvpn-server_config-html.lsp \
openvpn-status_info-html.lsp \
openvpn-unknown_config-html.lsp \
diff --git a/openvpn-controller.lua b/openvpn-controller.lua
index c2f5a4c..cf38b26 100644
--- a/openvpn-controller.lua
+++ b/openvpn-controller.lua
@@ -6,7 +6,7 @@ module (..., package.seeall)
-- We use the self.conf table because it already has prefix,controller,etc
-- The redir code is defined in the application error handler (acf-controller)
local list_redir = function (self)
- self.conf.action = "read"
+ self.conf.action = "status"
self.conf.type = "redir"
error (self.conf)
end
@@ -21,8 +21,7 @@ mvc.on_load = function(self, parent)
end
-
-read = function (self)
+status = function (self)
-- FIXME: If return 1 rows go direct to that config-page
return ( {conflistfiles = self.model:get_conflist(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller, version = self.model:openvpn_version()} )
end
diff --git a/openvpn-read-html.lsp b/openvpn-status-html.lsp
index 98475d2..98475d2 100644
--- a/openvpn-read-html.lsp
+++ b/openvpn-status-html.lsp
diff --git a/openvpn.menu b/openvpn.menu
index 8feef32..96edf76 100644
--- a/openvpn.menu
+++ b/openvpn.menu
@@ -1,2 +1,2 @@
#CAT GROUP/DESC TAB ACTION
-Networking OpenVPN OpenVPN read
+Networking 40OpenVPN status status