From 5b2601a56907b02efc6567354fa051ef08d97b6f Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 7 Feb 2008 12:52:44 -0500 Subject: Changing func to certmaster in top level directories, also covered certs directory, lots more to do. --- AUTHORS | 13 ++++++++ MANIFEST | 92 ---------------------------------------------------- README | 8 +++-- certs/master-keys.py | 10 +++--- certs/slave-keys.py | 12 +++---- setup.py | 28 +++++----------- 6 files changed, 38 insertions(+), 125 deletions(-) create mode 100644 AUTHORS delete mode 100644 MANIFEST diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..dc87abc --- /dev/null +++ b/AUTHORS @@ -0,0 +1,13 @@ + +certmaster is written and maintained by (alphabetically) ... + + Michael DeHaan + Adrian Likins + Seth Vidal + ... + +Additional patches and contributions by ... + + ... + [ send in patches (or modules!) to get your name here ] + diff --git a/MANIFEST b/MANIFEST deleted file mode 100644 index a1ab323..0000000 --- a/MANIFEST +++ /dev/null @@ -1,92 +0,0 @@ -AUTHORS -LICENSE -README -setup.py -version -docs/.gitignore -docs/Makefile -docs/certmaster-ca.1.gz -docs/certmaster-ca.pod -docs/certmaster.1.gz -docs/certmaster.pod -docs/func-inventory.1.gz -docs/func-inventory.pod -docs/func.1.gz -docs/func.pod -docs/funcd.1.gz -docs/funcd.pod -etc/certmaster.conf -etc/func_rotate -etc/minion.conf -etc/sample.acl -func/CommonErrors.py -func/SSLCommon.py -func/SSLConnection.py -func/__init__.py -func/certmaster.py -func/certs.py -func/codes.py -func/commonconfig.py -func/config.py -func/forkbomb.py -func/jobthing.py -func/logger.py -func/utils.py -func/minion/AuthedXMLRPCServer.py -func/minion/__init__.py -func/minion/codes.py -func/minion/module_loader.py -func/minion/server.py -func/minion/sub_process.py -func/minion/utils.py -func/minion/modules/__init__.py -func/minion/modules/certmaster.py -func/minion/modules/command.py -func/minion/modules/copyfile.py -func/minion/modules/filetracker.py -func/minion/modules/func_module.py -func/minion/modules/hardware.py -func/minion/modules/jobs.py -func/minion/modules/mount.py -func/minion/modules/nagios-check.py -func/minion/modules/networktest.py -func/minion/modules/process.py -func/minion/modules/reboot.py -func/minion/modules/rpms.py -func/minion/modules/service.py -func/minion/modules/smart.py -func/minion/modules/snmp.py -func/minion/modules/sysctl.py -func/minion/modules/test.py -func/minion/modules/virt.py -func/minion/modules/yumcmd.py -func/minion/modules/netapp/__init__.py -func/minion/modules/netapp/common.py -func/minion/modules/netapp/snap.py -func/minion/modules/netapp/vol/__init__.py -func/minion/modules/netapp/vol/clone.py -func/overlord/__init__.py -func/overlord/client.py -func/overlord/command.py -func/overlord/func_command.py -func/overlord/groups.py -func/overlord/highlevel.py -func/overlord/inventory.py -func/overlord/sslclient.py -func/overlord/test_func.py -func/overlord/cmd_modules/__init__.py -func/overlord/cmd_modules/call.py -func/overlord/cmd_modules/copyfile.py -func/overlord/cmd_modules/listminions.py -func/overlord/cmd_modules/ping.py -func/overlord/cmd_modules/show.py -func/overlord/modules/netapp.py -init-scripts/certmaster -init-scripts/funcd -po/messages.pot -scripts/certmaster -scripts/certmaster-ca -scripts/func -scripts/func-create-module -scripts/func-inventory -scripts/funcd diff --git a/README b/README index 6db886c..0e3b168 100644 --- a/README +++ b/README @@ -1,6 +1,8 @@ -func - Fedora unified Network Controller? +certmaster -- it hands out SSL certs! -https://hosted.fedoraproject.org/projects/func/ +read more at: -Source: http://git.fedoraproject.org/hosted/func.git/ +https://hosted.fedoraproject.org/projects/certmaster + +Source: http://git.fedoraproject.org/git/certmaster.git diff --git a/certs/master-keys.py b/certs/master-keys.py index 2c3f6e5..0ea24a8 100644 --- a/certs/master-keys.py +++ b/certs/master-keys.py @@ -12,18 +12,18 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# Copyright (c) 2007 Red Hat, inc +# Copyright (c) 2007-2008 Red Hat, inc #- Written by Seth Vidal skvidal @ fedoraproject.org import sys import os import os.path -import func.certs +import certmaster.certs -cadir = '/etc/pki/func/ca' -ca_key_file = '%s/funcmaster.key' % cadir -ca_cert_file = '%s/funcmaster.crt' % cadir +cadir = '/etc/pki/certmaster/ca' +ca_key_file = '%s/certmaster.key' % cadir +ca_cert_file = '%s/certmaster.crt' % cadir def main(): diff --git a/certs/slave-keys.py b/certs/slave-keys.py index 8ddae81..b8cde7c 100644 --- a/certs/slave-keys.py +++ b/certs/slave-keys.py @@ -12,7 +12,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# Copyright (c) 2007 Red Hat, inc +# Copyright (c) 2007-2008 Red Hat, inc #- Written by Seth Vidal skvidal @ fedoraproject.org import sys @@ -23,7 +23,7 @@ import time from exceptions import Exception -import func.certs +import certmaster.certs def submit_csr_to_master(csr_file, master_uri): @@ -49,11 +49,11 @@ def main(cert_dir, master_uri): if not os.path.exists(cert_dir): os.makedirs(cert_dir) if not os.path.exists(key_file): - keypair = func.certs.make_keypair(dest=key_file) + keypair = certmaster.certs.make_keypair(dest=key_file) if not os.path.exists(csr_file): if not keypair: - keypair = func.certs.retrieve_key_from_file(key_file) - csr = func.certs.make_csr(keypair, dest=csr_file) + keypair = certmaster.certs.retrieve_key_from_file(key_file) + csr = certmaster.certs.make_csr(keypair, dest=csr_file) except Exception, e: # need a little more specificity here print e return 1 @@ -81,7 +81,7 @@ if __name__ == "__main__": if len(sys.argv[1:]) > 0: cert_dir = sys.argv[1] else: - cert_dir = '/etc/pki/func' + cert_dir = '/etc/pki/certmaster' if len(sys.argv[1:]) > 1: master_uri = sys.argv[2] diff --git a/setup.py b/setup.py index 332ff96..effe61e 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup #from setuptools import setup,find_packages -NAME = "func" +NAME = "certmaster" VERSION = open("version", "r+").read().split()[0] SHORT_DESC = "%s remote configuration and management api" % NAME LONG_DESC = """ @@ -26,14 +26,12 @@ if __name__ == "__main__": name="%s" % NAME, version = VERSION, author = "Lots", - author_email = "func-list@redhat.com", - url = "https://hosted.fedoraproject.org/projects/func/", + author_email = "certmaster-list@redhat.com", + url = "https://hosted.fedoraproject.org/projects/certmaster/", license = "GPL", scripts = [ - "scripts/funcd", "scripts/func", "scripts/certmaster", "scripts/certmaster-ca", - "scripts/func-inventory", - "scripts/func-create-module", + "scripts/certmaster-request", ], # package_data = { '' : ['*.*'] }, package_dir = {"%s" % NAME: "%s" % NAME @@ -41,26 +39,18 @@ if __name__ == "__main__": packages = ["%s" % NAME, "%s/minion" % NAME, "%s/overlord" % NAME, - "%s/overlord/cmd_modules" % NAME, - "%s/overlord/modules" % NAME, - "%s/minion/modules" % NAME, - # FIXME if there's a clean/easy way to recursively - # find modules then by all means do it, for now - # this will work. - "%s/minion/modules.netapp" % NAME, - "%s/minion/modules.netapp.vol" % NAME ], - data_files = [(initpath, ["init-scripts/funcd"]), + data_files = [(initpath, ["init-scripts/certmasterd"]), (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-inventory.1.gz"]), + (manpath, ["docs/certmasterd.1.gz"]), (manpath, ["docs/certmaster.1.gz"]), (manpath, ["docs/certmaster-ca.1.gz"]), - (rotpath, ['etc/func_rotate']), + (rotpath, ['etc/certmaster_rotate']), (logpath, []), (certdir, []), (etcpath, []), -- cgit