Initial functionsv1.0_alpha1

git-svn-id: svn://svn.alpinelinux.org/acf/openvpn/trunk@338 ab2d0c66-481e-0410-8bed-d214d4d58bed

2 files changed, 63 insertions, 8 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..eb4c5eb
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,52 @@
+APP_NAME=openvpn
+PACKAGE=acf-$(APP_NAME)
+VERSION=1.0_alpha1
+
+APP_DIST=openvpn-client_config-html.lsp \
+	openvpn-controller.lua		\
+	openvpn-logfile-html.lsp	\
+	openvpn-model.lua		\
+	openvpn-pem_info-html.lsp	\
+	openvpn-read-html.lsp		\
+	openvpn-server_config-html.lsp	\
+	openvpn-status_info-html.lsp	\
+	openvpn-unknown_config-html.lsp	\
+	openvpn.menu
+
+
+EXTRA_DIST=README Makefile config.mk
+
+DISTFILES=$(APP_DIST) $(EXTRA_DIST) 
+
+TAR=tar
+
+P=$(PACKAGE)-$(VERSION)
+tarball=$(P).tar.bz2
+install_dir=$(DESTDIR)/$(appdir)/$(APP_NAME)
+
+all:
+clean:
+	rm -rf $(tarball) $(P)
+
+dist: $(tarball)
+
+install:
+	mkdir -p "$(install_dir)"
+	cp -a $(APP_DIST) "$(install_dir)"
+
+$(tarball):	$(DISTFILES)
+	rm -rf $(P)
+	mkdir -p $(P)
+	cp $(DISTFILES) $(P)
+	$(TAR) -jcf $@ $(P)
+	rm -rf $(P)
+
+# target that creates a tar package, unpacks is and install from package
+dist-install: $(tarball)
+	$(TAR) -jxf $(tarball)
+	$(MAKE) -C $(P) install DESTDIR=$(DESTDIR)
+	rm -rf $(P)
+
+include config.mk
+
+.PHONY: all clean dist install dist-install
diff --git a/openvpn-model.lua b/openvpn-model.lua
index 4e60764..2a86809 100644
--- a/openvpn-model.lua
+++ b/openvpn-model.lua
@@ -22,15 +22,16 @@ local function read_file_as_array ( path )
 end
 
 
-local is_running = function( process )
+local is_running = function( process, parameters )
 	local retval = false
-	local file = io.popen("pidof " .. process)
-	if file ~= nil then
-		local line = file:read( "*l" )
+	local pidofs = io.popen("pidof " .. process)
+	if pidofs ~= nil then
+	for pidof in string.gsub(pidofs, "%a+") do
+		local file = io.open( "/proc/" .. pidof .. "/cmdline" )
+		local file_result = file:read("*a") or "unknown"
 		file:close()
-		if #line > 0 then
-			retval = true
-		end
+		retval = file_result
+	end
 	end
 	
 	return retval
@@ -125,7 +126,9 @@ function list_conffiles()
 	  	for a,b in ipairs(files) do
 			if string.match (b, "^.*conf$") then
 				local conf_type = check_valid_config ( b )
-				local init_script = has_init_script ( string.gsub(b, "(%w+)(\..*)", "%1") )
+--				local init_script = is_running ( string.gsub(b, "(%w+)(\..*)", "%1") )
+			--	local init_script = string.gsub(b, "(%w+)(\..*)", "%1")
+				local init_script = is_running ("openvpn", b)
 				table.insert ( conlistfiles, cfe{ value = b, type = conf_type, init = init_script} )
 			end
 		end