From a7f4aa9054875f4fdce090afcecdf858c9cc2746 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 2 Feb 2015 11:25:41 -0500 Subject: Some bugfixes to make basedir work --- openssl-model.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openssl-model.lua b/openssl-model.lua index edafbd7..4806d9d 100644 --- a/openssl-model.lua +++ b/openssl-model.lua @@ -33,10 +33,10 @@ local ca_mandatory_entries = { "new_certs_dir", "certificate", "private_key", "d local initializecfe = function(self, clientdata, label) local retval = cfe({ type="group", value={}, label=label or "" }) - retval.value.basedir = cfe({ label="Base Directory", key=true }) + retval.value.basedir = cfe({ type="hidden", label="Base Directory", key=true }) self.handle_clientdata(retval, clientdata) if retval.value.basedir.value ~= "" then - openssldir = retval.value.basedir.value + openssldir = posix.dirname(retval.value.basedir.value.."/tmp").."/" end return retval end @@ -957,7 +957,7 @@ mymodule.getconfigfile = function(self, clientdata) local retval = initializecfe(self, clientdata, "") local retval2 = modelfunctions.getfiledetails(openssldir..configfile) for name,value in pairs(retval.value) do - retval2.value.name = value + retval2.value[name] = value end return retval2 end -- cgit v1.2.3