diff options
-rw-r--r-- | openvpn-model.lua | 17 | ||||
-rw-r--r-- | openvpn-read-html.lsp | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/openvpn-model.lua b/openvpn-model.lua index 32fc33b..aefadff 100644 --- a/openvpn-model.lua +++ b/openvpn-model.lua @@ -3,6 +3,7 @@ module (..., package.seeall) require ("posix") require ("format") require ("fs") +require ("procps") local baseurl = "/etc/openvpn/" @@ -55,13 +56,15 @@ end local is_running = function( process, parameters ) - local strsplit = require("split") +-- local strsplit = require("split") local retval = "" - local tst = "" - local pidofsx, error = io.popen("pidof " .. process ,r) - local pidofs = string.gsub(pidofsx:read("*a"), "\n", "") - pidofsx:close() - for v in string.gmatch(pidofs, "%S+") do +-- local tst = "" +-- local pidofsx, error = io.popen("pidof " .. process ,r) +-- local pidofs = string.gsub(pidofsx:read("*a"), "\n", "") +-- pidofsx:close() +-- for v in string.gmatch(pidofs, "%S+") do + local i,v + for i,v in ipairs(procps.pidof(process) or {}) do local path = string.gsub("/proc/".. v .. "/cmdline", "%s", "") local f,err = io.open(path,r) local file_resultx = f:read("*a") @@ -277,7 +280,7 @@ end function get_conflist () local configlist = {} - for k,v in pairs(list_conffiles()) do + for k,v in pairs(list_conffiles() or {}) do config = config_content ( v.name ) local conf_type, err = check_valid_config ( v.name ) local isrunning = is_running ("openvpn", v.name) diff --git a/openvpn-read-html.lsp b/openvpn-read-html.lsp index 3e639b1..d7d454c 100644 --- a/openvpn-read-html.lsp +++ b/openvpn-read-html.lsp @@ -1,8 +1,10 @@ <? local view = ... ?> <h1>SYSTEM INFO</h1> +<dl> <dt>Program version</dt> <DD><?= view.version ?></DD> +</dl> <H2>PROGRAM SPECIFIC OPTIONS/INFORMATION</H2> |