diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2008-06-24 17:57:36 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2008-06-24 17:57:36 +0000 |
| commit | 00622fadb3b2846f5768841b5d187fd15de7f2f6 (patch) | |
| tree | 926ffc1553884c62b7c4d6c9feba980e1e25dfbb /openssl-model.lua | |
| parent | 46350f93bb752cb8674b78dc5b02a37607e5877d (diff) | |
| download | acf-openssl-00622fadb3b2846f5768841b5d187fd15de7f2f6.tar.bz2 acf-openssl-00622fadb3b2846f5768841b5d187fd15de7f2f6.tar.xz | |
Changed openssl config file name and fixed environment check.
git-svn-id: svn://svn.alpinelinux.org/acf/openssl/trunk@1256 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'openssl-model.lua')
| -rw-r--r-- | openssl-model.lua | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/openssl-model.lua b/openssl-model.lua index 2502c4a..3d1f1f6 100644 --- a/openssl-model.lua +++ b/openssl-model.lua @@ -10,7 +10,8 @@ require("validator") -- 'username'.'ca section name'.'common name'.csr local packagename = "openssl" -local configfile = "/etc/ssl/openssl.cnf" +--local configfile = "/etc/ssl/openssl.cnf" +local configfile = "/etc/ssl/openssl-ca-acf.cnf" local requestdir = "/etc/ssl/req/" local certdir = "/etc/ssl/cert/" local openssldir = "/etc/ssl/" @@ -725,26 +726,37 @@ checkenvironment = function(set) -- Then check for the config file entries config = config or getopts.getoptsfromfile(configfile) - local path = getconfigentry(config.ca.default_ca, "new_certs_dir") - errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("new_certs_dir", path) + if config then + local path = getconfigentry(config.ca.default_ca, "new_certs_dir") + errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("new_certs_dir", path) - local file = getconfigentry(config.ca.default_ca, "certificate") - path = dirname(file) - errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("certificate directory", path) + local file = getconfigentry(config.ca.default_ca, "certificate") + path = dirname(file) + errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("certificate directory", path) - file = getconfigentry(config.ca.default_ca, "private_key") - path = dirname(file) - errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("private_key directory", path) + file = getconfigentry(config.ca.default_ca, "private_key") + path = dirname(file) + errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("private_key directory", path) - file = getconfigentry(config.ca.default_ca, "database") - path = dirname(file) - errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("database directory", path) - errtxt[#errtxt+1], cmdline[#cmdline+1] = checkfile("database", file) + file = getconfigentry(config.ca.default_ca, "database") + path = dirname(file) + errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("database directory", path) + errtxt[#errtxt+1], cmdline[#cmdline+1] = checkfile("database", file) - file = getconfigentry(config.ca.default_ca, "serial") - path = dirname(file) - errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("serial directory", path) - errtxt[#errtxt+1], cmdline[#cmdline+1] = checkfile("serial", file, "01") + file = getconfigentry(config.ca.default_ca, "serial") + path = dirname(file) + errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("serial directory", path) + errtxt[#errtxt+1], cmdline[#cmdline+1] = checkfile("serial", file, "01") + + file = getconfigentry(config.ca.default_ca, "crlnumber") + if file ~= "" then + path = dirname(file) + errtxt[#errtxt+1], cmdline[#cmdline+1] = checkdir("crlnumber directory", path) + errtxt[#errtxt+1], cmdline[#cmdline+1] = checkfile("crlnumber", file, "01") + end + else + errtxt[#errtxt+1] = "Configuration invalid" + end if set then -- loop through the cmdline and execute |