diff options
| -rwxr-xr-x | Makefile | 3 | ||||
| -rw-r--r-- | func/SSLCommon.py | 1 | ||||
| -rw-r--r-- | setup.py | 13 |
3 files changed, 7 insertions, 10 deletions
@@ -17,8 +17,6 @@ manpage: pod2man --center="funcd" --release="" ./docs/funcd.pod | gzip -c > ./docs/funcd.1.gz pod2man --center="func" --release="" ./docs/func.pod | gzip -c > ./docs/func.1.gz pod2man --center="func-inventory" --release="" ./docs/func-inventory.pod | gzip -c > ./docs/func-inventory.1.gz - pod2man --center="certmaster" --release="" ./docs/certmaster.pod | gzip -c > ./docs/certmaster.1.gz - pod2man --center="certmaster-ca" --release="" ./docs/certmaster-ca.pod | gzip -c > ./docs/certmaster-ca.1.gz messages: func/minion/*.py xgettext -k_ -kN_ -o $(MESSAGESPOT) func/minion/*.py @@ -66,6 +64,7 @@ install_rpm: -rpm -Uvh rpm-build/func-$(VERSION)-$(RELEASE)$(shell rpm -E "%{?dist}").noarch.rpm restart: + # not in this package anymore, but since this target is for devel testing, leave it anyway -/etc/init.d/certmaster restart -/etc/init.d/funcd restart diff --git a/func/SSLCommon.py b/func/SSLCommon.py index 6959749..b37fc68 100644 --- a/func/SSLCommon.py +++ b/func/SSLCommon.py @@ -30,6 +30,7 @@ def our_verify(connection, x509, errNum, errDepth, preverifyOK): def CreateSSLContext(pkey, cert, ca_cert): + print pkey, cert, ca_cert for f in pkey, cert, ca_cert: if f and not os.access(f, os.R_OK): print "%s does not exist or is not readable." % f @@ -18,8 +18,9 @@ if __name__ == "__main__": etcmodpath = "/etc/%s/modules" % NAME initpath = "/etc/init.d/" logpath = "/var/log/%s/" % NAME - certdir = "/var/lib/%s/certmaster" % NAME - pkipath = "/etc/pki/%s" % NAME + certdir = "/var/lib/certmaster/" + pkidir = "/etc/pki/%s" % NAME + libdir = "/var/lib/%s" % NAME rotpath = "/etc/logrotate.d" aclpath = "%s/minion-acl.d" % etcpath setup( @@ -31,7 +32,6 @@ if __name__ == "__main__": license = "GPL", scripts = [ "scripts/funcd", "scripts/func", - "scripts/certmaster", "scripts/certmaster-ca", "scripts/func-inventory", "scripts/func-create-module", ], @@ -51,20 +51,17 @@ if __name__ == "__main__": "%s/minion/modules.netapp.vol" % NAME ], data_files = [(initpath, ["init-scripts/funcd"]), - (initpath, ["init-scripts/certmaster"]), (etcpath, ["etc/minion.conf"]), - (etcpath, ["etc/certmaster.conf"]), (etcmodpath, []), (manpath, ["docs/func.1.gz"]), (manpath, ["docs/func-inventory.1.gz"]), (manpath, ["docs/funcd.1.gz"]), - (manpath, ["docs/certmaster.1.gz"]), - (manpath, ["docs/certmaster-ca.1.gz"]), (rotpath, ['etc/func_rotate']), (logpath, []), + (libdir, []), (certdir, []), + (pkidir, []), (etcpath, []), - (pkipath, []), (aclpath, []) ], description = SHORT_DESC, |