diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-02-25 14:29:57 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-02-25 14:29:57 -0500 |
| commit | f2e2df8491b9e9d71ed88855e2b043f76d22e119 (patch) | |
| tree | 5a4b69c9b9e38057256624f1c173f59d928487e5 | |
| parent | 6fd13e5c3c572ebb64d70cfaa2f2160a13dbc838 (diff) | |
| download | func-f2e2df8491b9e9d71ed88855e2b043f76d22e119.tar.gz func-f2e2df8491b9e9d71ed88855e2b043f76d22e119.tar.xz func-f2e2df8491b9e9d71ed88855e2b043f76d22e119.zip | |
Revert "first pass at splitting off certmaster"
This reverts commit 6fd13e5c3c572ebb64d70cfaa2f2160a13dbc838.
| -rwxr-xr-x | Makefile | 3 | ||||
| -rw-r--r-- | func/SSLCommon.py | 1 | ||||
| -rw-r--r-- | setup.py | 13 |
3 files changed, 10 insertions, 7 deletions
@@ -17,6 +17,8 @@ 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 @@ -64,7 +66,6 @@ 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 b37fc68..6959749 100644 --- a/func/SSLCommon.py +++ b/func/SSLCommon.py @@ -30,7 +30,6 @@ 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,9 +18,8 @@ if __name__ == "__main__": etcmodpath = "/etc/%s/modules" % NAME initpath = "/etc/init.d/" logpath = "/var/log/%s/" % NAME - certdir = "/var/lib/certmaster/" - pkidir = "/etc/pki/%s" % NAME - libdir = "/var/lib/%s" % NAME + certdir = "/var/lib/%s/certmaster" % NAME + pkipath = "/etc/pki/%s" % NAME rotpath = "/etc/logrotate.d" aclpath = "%s/minion-acl.d" % etcpath setup( @@ -32,6 +31,7 @@ if __name__ == "__main__": license = "GPL", scripts = [ "scripts/funcd", "scripts/func", + "scripts/certmaster", "scripts/certmaster-ca", "scripts/func-inventory", "scripts/func-create-module", ], @@ -51,17 +51,20 @@ 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, |