From 8f2ff4d7c902d534d68ff1a16418b7be492033bf Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 7 Feb 2008 13:13:24 -0500 Subject: [PATCH] Carving away at func some more to just get down to cert items, still lots more to do. --- {func => certmaster}/CommonErrors.py | 0 {func => certmaster}/Makefile | 0 {func => certmaster}/SSLCommon.py | 0 {func => certmaster}/SSLConnection.py | 0 {func => certmaster}/__init__.py | 0 {func => certmaster}/certmaster.py | 0 {func => certmaster}/certs.py | 0 {func => certmaster}/codes.py | 0 {func => certmaster}/commonconfig.py | 0 {func => certmaster}/config.py | 0 {func => certmaster}/forkbomb.py | 0 {func => certmaster}/jobthing.py | 0 {func => certmaster}/logger.py | 0 .../minion/AuthedXMLRPCServer.py | 0 {func => certmaster}/minion/Makefile | 0 {func => certmaster}/minion/__init__.py | 0 {func => certmaster}/minion/codes.py | 0 {func => certmaster}/minion/module_loader.py | 0 {func => certmaster}/minion/modules/Makefile | 0 .../minion/modules/__init__.py | 0 .../minion/modules/certmaster.py | 0 .../minion/modules/command.py | 0 .../minion/modules/copyfile.py | 0 .../minion/modules/filetracker.py | 0 .../minion/modules/func_module.py | 0 .../minion/modules/func_module.py.orig | 0 .../minion/modules/hardware.py | 0 {func => certmaster}/minion/modules/jobs.py | 0 {func => certmaster}/minion/modules/mount.py | 0 .../minion/modules/nagios-check.py | 0 .../minion/modules/netapp/README | 0 .../minion/modules/netapp/TODO | 0 .../minion/modules/netapp/__init__.py | 0 .../minion/modules/netapp/common.py | 0 .../minion/modules/netapp/snap.py | 0 .../minion/modules/netapp/vol/__init__.py | 0 .../minion/modules/netapp/vol/clone.py | 0 .../minion/modules/networktest.py | 0 .../minion/modules/process.py | 0 .../minion/modules/process.py.orig | 0 {func => certmaster}/minion/modules/reboot.py | 0 {func => certmaster}/minion/modules/rpms.py | 0 .../minion/modules/service.py | 0 {func => certmaster}/minion/modules/smart.py | 0 {func => certmaster}/minion/modules/snmp.py | 0 {func => certmaster}/minion/modules/sysctl.py | 0 {func => certmaster}/minion/modules/test.py | 0 {func => certmaster}/minion/modules/virt.py | 0 {func => certmaster}/minion/modules/yumcmd.py | 0 {func => certmaster}/minion/server.py | 0 {func => certmaster}/minion/sub_process.py | 0 {func => certmaster}/minion/utils.py | 0 .../overlord/.forkbomb.py.swp | Bin {func => certmaster}/overlord/Makefile | 0 {func => certmaster}/overlord/__init__.py | 0 {func => certmaster}/overlord/__init__.pyc | Bin {func => certmaster}/overlord/client.py | 0 {func => certmaster}/overlord/client.pyc | Bin .../overlord/cmd_modules/__init__.py | 0 .../overlord/cmd_modules/__init__.pyc | Bin .../overlord/cmd_modules/call.py | 0 .../overlord/cmd_modules/call.pyc | Bin .../overlord/cmd_modules/copyfile.py | 0 .../overlord/cmd_modules/listminions.py | 0 .../overlord/cmd_modules/ping.py | 0 .../overlord/cmd_modules/show.py | 0 {func => certmaster}/overlord/command.py | 0 {func => certmaster}/overlord/command.pyc | Bin {func => certmaster}/overlord/forkbomb.pyc | Bin {func => certmaster}/overlord/func_command.py | 0 .../overlord/func_command.pyc | Bin {func => certmaster}/overlord/groups.py | 0 {func => certmaster}/overlord/groups.pyc | Bin {func => certmaster}/overlord/highlevel.py | 0 {func => certmaster}/overlord/inventory.py | 0 {func => certmaster}/overlord/jobthing.pyc | Bin .../overlord/modules/netapp.py | 0 {func => certmaster}/overlord/sslclient.py | 0 {func => certmaster}/overlord/sslclient.pyc | Bin {func => certmaster}/overlord/test_func.py | 0 {func => certmaster}/utils.py | 0 docs/certmaster-ca.pod | 13 +- docs/certmaster-request.pod | 36 ++++++ docs/certmaster.pod | 15 ++- docs/func-inventory.pod | 70 ----------- docs/func.pod | 111 ----------------- docs/funcd.pod | 25 ---- etc/{func_rotate => certmaster_rotate} | 0 etc/sample.acl | 5 - init-scripts/funcd | 115 ------------------ scripts/{funcd => certmaster-request} | 0 scripts/func | 14 --- scripts/func-create-module | 79 ------------ scripts/func-inventory | 8 -- version | 2 +- 95 files changed, 49 insertions(+), 444 deletions(-) rename {func => certmaster}/CommonErrors.py (100%) rename {func => certmaster}/Makefile (100%) rename {func => certmaster}/SSLCommon.py (100%) rename {func => certmaster}/SSLConnection.py (100%) rename {func => certmaster}/__init__.py (100%) rename {func => certmaster}/certmaster.py (100%) rename {func => certmaster}/certs.py (100%) rename {func => certmaster}/codes.py (100%) rename {func => certmaster}/commonconfig.py (100%) rename {func => certmaster}/config.py (100%) rename {func => certmaster}/forkbomb.py (100%) rename {func => certmaster}/jobthing.py (100%) rename {func => certmaster}/logger.py (100%) rename {func => certmaster}/minion/AuthedXMLRPCServer.py (100%) rename {func => certmaster}/minion/Makefile (100%) rename {func => certmaster}/minion/__init__.py (100%) rename {func => certmaster}/minion/codes.py (100%) rename {func => certmaster}/minion/module_loader.py (100%) rename {func => certmaster}/minion/modules/Makefile (100%) rename {func => certmaster}/minion/modules/__init__.py (100%) rename {func => certmaster}/minion/modules/certmaster.py (100%) rename {func => certmaster}/minion/modules/command.py (100%) rename {func => certmaster}/minion/modules/copyfile.py (100%) rename {func => certmaster}/minion/modules/filetracker.py (100%) rename {func => certmaster}/minion/modules/func_module.py (100%) rename {func => certmaster}/minion/modules/func_module.py.orig (100%) rename {func => certmaster}/minion/modules/hardware.py (100%) rename {func => certmaster}/minion/modules/jobs.py (100%) rename {func => certmaster}/minion/modules/mount.py (100%) rename {func => certmaster}/minion/modules/nagios-check.py (100%) rename {func => certmaster}/minion/modules/netapp/README (100%) rename {func => certmaster}/minion/modules/netapp/TODO (100%) rename {func => certmaster}/minion/modules/netapp/__init__.py (100%) rename {func => certmaster}/minion/modules/netapp/common.py (100%) rename {func => certmaster}/minion/modules/netapp/snap.py (100%) rename {func => certmaster}/minion/modules/netapp/vol/__init__.py (100%) rename {func => certmaster}/minion/modules/netapp/vol/clone.py (100%) rename {func => certmaster}/minion/modules/networktest.py (100%) rename {func => certmaster}/minion/modules/process.py (100%) rename {func => certmaster}/minion/modules/process.py.orig (100%) rename {func => certmaster}/minion/modules/reboot.py (100%) rename {func => certmaster}/minion/modules/rpms.py (100%) rename {func => certmaster}/minion/modules/service.py (100%) rename {func => certmaster}/minion/modules/smart.py (100%) rename {func => certmaster}/minion/modules/snmp.py (100%) rename {func => certmaster}/minion/modules/sysctl.py (100%) rename {func => certmaster}/minion/modules/test.py (100%) rename {func => certmaster}/minion/modules/virt.py (100%) rename {func => certmaster}/minion/modules/yumcmd.py (100%) rename {func => certmaster}/minion/server.py (100%) rename {func => certmaster}/minion/sub_process.py (100%) rename {func => certmaster}/minion/utils.py (100%) rename {func => certmaster}/overlord/.forkbomb.py.swp (100%) rename {func => certmaster}/overlord/Makefile (100%) rename {func => certmaster}/overlord/__init__.py (100%) rename {func => certmaster}/overlord/__init__.pyc (100%) rename {func => certmaster}/overlord/client.py (100%) rename {func => certmaster}/overlord/client.pyc (100%) rename {func => certmaster}/overlord/cmd_modules/__init__.py (100%) rename {func => certmaster}/overlord/cmd_modules/__init__.pyc (100%) rename {func => certmaster}/overlord/cmd_modules/call.py (100%) rename {func => certmaster}/overlord/cmd_modules/call.pyc (100%) rename {func => certmaster}/overlord/cmd_modules/copyfile.py (100%) rename {func => certmaster}/overlord/cmd_modules/listminions.py (100%) rename {func => certmaster}/overlord/cmd_modules/ping.py (100%) rename {func => certmaster}/overlord/cmd_modules/show.py (100%) rename {func => certmaster}/overlord/command.py (100%) rename {func => certmaster}/overlord/command.pyc (100%) rename {func => certmaster}/overlord/forkbomb.pyc (100%) rename {func => certmaster}/overlord/func_command.py (100%) rename {func => certmaster}/overlord/func_command.pyc (100%) rename {func => certmaster}/overlord/groups.py (100%) rename {func => certmaster}/overlord/groups.pyc (100%) rename {func => certmaster}/overlord/highlevel.py (100%) rename {func => certmaster}/overlord/inventory.py (100%) rename {func => certmaster}/overlord/jobthing.pyc (100%) rename {func => certmaster}/overlord/modules/netapp.py (100%) rename {func => certmaster}/overlord/sslclient.py (100%) rename {func => certmaster}/overlord/sslclient.pyc (100%) rename {func => certmaster}/overlord/test_func.py (100%) rename {func => certmaster}/utils.py (100%) create mode 100644 docs/certmaster-request.pod delete mode 100644 docs/func-inventory.pod delete mode 100644 docs/func.pod delete mode 100644 docs/funcd.pod rename etc/{func_rotate => certmaster_rotate} (100%) delete mode 100644 etc/sample.acl delete mode 100755 init-scripts/funcd rename scripts/{funcd => certmaster-request} (100%) delete mode 100755 scripts/func delete mode 100755 scripts/func-create-module delete mode 100755 scripts/func-inventory diff --git a/func/CommonErrors.py b/certmaster/CommonErrors.py similarity index 100% rename from func/CommonErrors.py rename to certmaster/CommonErrors.py diff --git a/func/Makefile b/certmaster/Makefile similarity index 100% rename from func/Makefile rename to certmaster/Makefile diff --git a/func/SSLCommon.py b/certmaster/SSLCommon.py similarity index 100% rename from func/SSLCommon.py rename to certmaster/SSLCommon.py diff --git a/func/SSLConnection.py b/certmaster/SSLConnection.py similarity index 100% rename from func/SSLConnection.py rename to certmaster/SSLConnection.py diff --git a/func/__init__.py b/certmaster/__init__.py similarity index 100% rename from func/__init__.py rename to certmaster/__init__.py diff --git a/func/certmaster.py b/certmaster/certmaster.py similarity index 100% rename from func/certmaster.py rename to certmaster/certmaster.py diff --git a/func/certs.py b/certmaster/certs.py similarity index 100% rename from func/certs.py rename to certmaster/certs.py diff --git a/func/codes.py b/certmaster/codes.py similarity index 100% rename from func/codes.py rename to certmaster/codes.py diff --git a/func/commonconfig.py b/certmaster/commonconfig.py similarity index 100% rename from func/commonconfig.py rename to certmaster/commonconfig.py diff --git a/func/config.py b/certmaster/config.py similarity index 100% rename from func/config.py rename to certmaster/config.py diff --git a/func/forkbomb.py b/certmaster/forkbomb.py similarity index 100% rename from func/forkbomb.py rename to certmaster/forkbomb.py diff --git a/func/jobthing.py b/certmaster/jobthing.py similarity index 100% rename from func/jobthing.py rename to certmaster/jobthing.py diff --git a/func/logger.py b/certmaster/logger.py similarity index 100% rename from func/logger.py rename to certmaster/logger.py diff --git a/func/minion/AuthedXMLRPCServer.py b/certmaster/minion/AuthedXMLRPCServer.py similarity index 100% rename from func/minion/AuthedXMLRPCServer.py rename to certmaster/minion/AuthedXMLRPCServer.py diff --git a/func/minion/Makefile b/certmaster/minion/Makefile similarity index 100% rename from func/minion/Makefile rename to certmaster/minion/Makefile diff --git a/func/minion/__init__.py b/certmaster/minion/__init__.py similarity index 100% rename from func/minion/__init__.py rename to certmaster/minion/__init__.py diff --git a/func/minion/codes.py b/certmaster/minion/codes.py similarity index 100% rename from func/minion/codes.py rename to certmaster/minion/codes.py diff --git a/func/minion/module_loader.py b/certmaster/minion/module_loader.py similarity index 100% rename from func/minion/module_loader.py rename to certmaster/minion/module_loader.py diff --git a/func/minion/modules/Makefile b/certmaster/minion/modules/Makefile similarity index 100% rename from func/minion/modules/Makefile rename to certmaster/minion/modules/Makefile diff --git a/func/minion/modules/__init__.py b/certmaster/minion/modules/__init__.py similarity index 100% rename from func/minion/modules/__init__.py rename to certmaster/minion/modules/__init__.py diff --git a/func/minion/modules/certmaster.py b/certmaster/minion/modules/certmaster.py similarity index 100% rename from func/minion/modules/certmaster.py rename to certmaster/minion/modules/certmaster.py diff --git a/func/minion/modules/command.py b/certmaster/minion/modules/command.py similarity index 100% rename from func/minion/modules/command.py rename to certmaster/minion/modules/command.py diff --git a/func/minion/modules/copyfile.py b/certmaster/minion/modules/copyfile.py similarity index 100% rename from func/minion/modules/copyfile.py rename to certmaster/minion/modules/copyfile.py diff --git a/func/minion/modules/filetracker.py b/certmaster/minion/modules/filetracker.py similarity index 100% rename from func/minion/modules/filetracker.py rename to certmaster/minion/modules/filetracker.py diff --git a/func/minion/modules/func_module.py b/certmaster/minion/modules/func_module.py similarity index 100% rename from func/minion/modules/func_module.py rename to certmaster/minion/modules/func_module.py diff --git a/func/minion/modules/func_module.py.orig b/certmaster/minion/modules/func_module.py.orig similarity index 100% rename from func/minion/modules/func_module.py.orig rename to certmaster/minion/modules/func_module.py.orig diff --git a/func/minion/modules/hardware.py b/certmaster/minion/modules/hardware.py similarity index 100% rename from func/minion/modules/hardware.py rename to certmaster/minion/modules/hardware.py diff --git a/func/minion/modules/jobs.py b/certmaster/minion/modules/jobs.py similarity index 100% rename from func/minion/modules/jobs.py rename to certmaster/minion/modules/jobs.py diff --git a/func/minion/modules/mount.py b/certmaster/minion/modules/mount.py similarity index 100% rename from func/minion/modules/mount.py rename to certmaster/minion/modules/mount.py diff --git a/func/minion/modules/nagios-check.py b/certmaster/minion/modules/nagios-check.py similarity index 100% rename from func/minion/modules/nagios-check.py rename to certmaster/minion/modules/nagios-check.py diff --git a/func/minion/modules/netapp/README b/certmaster/minion/modules/netapp/README similarity index 100% rename from func/minion/modules/netapp/README rename to certmaster/minion/modules/netapp/README diff --git a/func/minion/modules/netapp/TODO b/certmaster/minion/modules/netapp/TODO similarity index 100% rename from func/minion/modules/netapp/TODO rename to certmaster/minion/modules/netapp/TODO diff --git a/func/minion/modules/netapp/__init__.py b/certmaster/minion/modules/netapp/__init__.py similarity index 100% rename from func/minion/modules/netapp/__init__.py rename to certmaster/minion/modules/netapp/__init__.py diff --git a/func/minion/modules/netapp/common.py b/certmaster/minion/modules/netapp/common.py similarity index 100% rename from func/minion/modules/netapp/common.py rename to certmaster/minion/modules/netapp/common.py diff --git a/func/minion/modules/netapp/snap.py b/certmaster/minion/modules/netapp/snap.py similarity index 100% rename from func/minion/modules/netapp/snap.py rename to certmaster/minion/modules/netapp/snap.py diff --git a/func/minion/modules/netapp/vol/__init__.py b/certmaster/minion/modules/netapp/vol/__init__.py similarity index 100% rename from func/minion/modules/netapp/vol/__init__.py rename to certmaster/minion/modules/netapp/vol/__init__.py diff --git a/func/minion/modules/netapp/vol/clone.py b/certmaster/minion/modules/netapp/vol/clone.py similarity index 100% rename from func/minion/modules/netapp/vol/clone.py rename to certmaster/minion/modules/netapp/vol/clone.py diff --git a/func/minion/modules/networktest.py b/certmaster/minion/modules/networktest.py similarity index 100% rename from func/minion/modules/networktest.py rename to certmaster/minion/modules/networktest.py diff --git a/func/minion/modules/process.py b/certmaster/minion/modules/process.py similarity index 100% rename from func/minion/modules/process.py rename to certmaster/minion/modules/process.py diff --git a/func/minion/modules/process.py.orig b/certmaster/minion/modules/process.py.orig similarity index 100% rename from func/minion/modules/process.py.orig rename to certmaster/minion/modules/process.py.orig diff --git a/func/minion/modules/reboot.py b/certmaster/minion/modules/reboot.py similarity index 100% rename from func/minion/modules/reboot.py rename to certmaster/minion/modules/reboot.py diff --git a/func/minion/modules/rpms.py b/certmaster/minion/modules/rpms.py similarity index 100% rename from func/minion/modules/rpms.py rename to certmaster/minion/modules/rpms.py diff --git a/func/minion/modules/service.py b/certmaster/minion/modules/service.py similarity index 100% rename from func/minion/modules/service.py rename to certmaster/minion/modules/service.py diff --git a/func/minion/modules/smart.py b/certmaster/minion/modules/smart.py similarity index 100% rename from func/minion/modules/smart.py rename to certmaster/minion/modules/smart.py diff --git a/func/minion/modules/snmp.py b/certmaster/minion/modules/snmp.py similarity index 100% rename from func/minion/modules/snmp.py rename to certmaster/minion/modules/snmp.py diff --git a/func/minion/modules/sysctl.py b/certmaster/minion/modules/sysctl.py similarity index 100% rename from func/minion/modules/sysctl.py rename to certmaster/minion/modules/sysctl.py diff --git a/func/minion/modules/test.py b/certmaster/minion/modules/test.py similarity index 100% rename from func/minion/modules/test.py rename to certmaster/minion/modules/test.py diff --git a/func/minion/modules/virt.py b/certmaster/minion/modules/virt.py similarity index 100% rename from func/minion/modules/virt.py rename to certmaster/minion/modules/virt.py diff --git a/func/minion/modules/yumcmd.py b/certmaster/minion/modules/yumcmd.py similarity index 100% rename from func/minion/modules/yumcmd.py rename to certmaster/minion/modules/yumcmd.py diff --git a/func/minion/server.py b/certmaster/minion/server.py similarity index 100% rename from func/minion/server.py rename to certmaster/minion/server.py diff --git a/func/minion/sub_process.py b/certmaster/minion/sub_process.py similarity index 100% rename from func/minion/sub_process.py rename to certmaster/minion/sub_process.py diff --git a/func/minion/utils.py b/certmaster/minion/utils.py similarity index 100% rename from func/minion/utils.py rename to certmaster/minion/utils.py diff --git a/func/overlord/.forkbomb.py.swp b/certmaster/overlord/.forkbomb.py.swp similarity index 100% rename from func/overlord/.forkbomb.py.swp rename to certmaster/overlord/.forkbomb.py.swp diff --git a/func/overlord/Makefile b/certmaster/overlord/Makefile similarity index 100% rename from func/overlord/Makefile rename to certmaster/overlord/Makefile diff --git a/func/overlord/__init__.py b/certmaster/overlord/__init__.py similarity index 100% rename from func/overlord/__init__.py rename to certmaster/overlord/__init__.py diff --git a/func/overlord/__init__.pyc b/certmaster/overlord/__init__.pyc similarity index 100% rename from func/overlord/__init__.pyc rename to certmaster/overlord/__init__.pyc diff --git a/func/overlord/client.py b/certmaster/overlord/client.py similarity index 100% rename from func/overlord/client.py rename to certmaster/overlord/client.py diff --git a/func/overlord/client.pyc b/certmaster/overlord/client.pyc similarity index 100% rename from func/overlord/client.pyc rename to certmaster/overlord/client.pyc diff --git a/func/overlord/cmd_modules/__init__.py b/certmaster/overlord/cmd_modules/__init__.py similarity index 100% rename from func/overlord/cmd_modules/__init__.py rename to certmaster/overlord/cmd_modules/__init__.py diff --git a/func/overlord/cmd_modules/__init__.pyc b/certmaster/overlord/cmd_modules/__init__.pyc similarity index 100% rename from func/overlord/cmd_modules/__init__.pyc rename to certmaster/overlord/cmd_modules/__init__.pyc diff --git a/func/overlord/cmd_modules/call.py b/certmaster/overlord/cmd_modules/call.py similarity index 100% rename from func/overlord/cmd_modules/call.py rename to certmaster/overlord/cmd_modules/call.py diff --git a/func/overlord/cmd_modules/call.pyc b/certmaster/overlord/cmd_modules/call.pyc similarity index 100% rename from func/overlord/cmd_modules/call.pyc rename to certmaster/overlord/cmd_modules/call.pyc diff --git a/func/overlord/cmd_modules/copyfile.py b/certmaster/overlord/cmd_modules/copyfile.py similarity index 100% rename from func/overlord/cmd_modules/copyfile.py rename to certmaster/overlord/cmd_modules/copyfile.py diff --git a/func/overlord/cmd_modules/listminions.py b/certmaster/overlord/cmd_modules/listminions.py similarity index 100% rename from func/overlord/cmd_modules/listminions.py rename to certmaster/overlord/cmd_modules/listminions.py diff --git a/func/overlord/cmd_modules/ping.py b/certmaster/overlord/cmd_modules/ping.py similarity index 100% rename from func/overlord/cmd_modules/ping.py rename to certmaster/overlord/cmd_modules/ping.py diff --git a/func/overlord/cmd_modules/show.py b/certmaster/overlord/cmd_modules/show.py similarity index 100% rename from func/overlord/cmd_modules/show.py rename to certmaster/overlord/cmd_modules/show.py diff --git a/func/overlord/command.py b/certmaster/overlord/command.py similarity index 100% rename from func/overlord/command.py rename to certmaster/overlord/command.py diff --git a/func/overlord/command.pyc b/certmaster/overlord/command.pyc similarity index 100% rename from func/overlord/command.pyc rename to certmaster/overlord/command.pyc diff --git a/func/overlord/forkbomb.pyc b/certmaster/overlord/forkbomb.pyc similarity index 100% rename from func/overlord/forkbomb.pyc rename to certmaster/overlord/forkbomb.pyc diff --git a/func/overlord/func_command.py b/certmaster/overlord/func_command.py similarity index 100% rename from func/overlord/func_command.py rename to certmaster/overlord/func_command.py diff --git a/func/overlord/func_command.pyc b/certmaster/overlord/func_command.pyc similarity index 100% rename from func/overlord/func_command.pyc rename to certmaster/overlord/func_command.pyc diff --git a/func/overlord/groups.py b/certmaster/overlord/groups.py similarity index 100% rename from func/overlord/groups.py rename to certmaster/overlord/groups.py diff --git a/func/overlord/groups.pyc b/certmaster/overlord/groups.pyc similarity index 100% rename from func/overlord/groups.pyc rename to certmaster/overlord/groups.pyc diff --git a/func/overlord/highlevel.py b/certmaster/overlord/highlevel.py similarity index 100% rename from func/overlord/highlevel.py rename to certmaster/overlord/highlevel.py diff --git a/func/overlord/inventory.py b/certmaster/overlord/inventory.py similarity index 100% rename from func/overlord/inventory.py rename to certmaster/overlord/inventory.py diff --git a/func/overlord/jobthing.pyc b/certmaster/overlord/jobthing.pyc similarity index 100% rename from func/overlord/jobthing.pyc rename to certmaster/overlord/jobthing.pyc diff --git a/func/overlord/modules/netapp.py b/certmaster/overlord/modules/netapp.py similarity index 100% rename from func/overlord/modules/netapp.py rename to certmaster/overlord/modules/netapp.py diff --git a/func/overlord/sslclient.py b/certmaster/overlord/sslclient.py similarity index 100% rename from func/overlord/sslclient.py rename to certmaster/overlord/sslclient.py diff --git a/func/overlord/sslclient.pyc b/certmaster/overlord/sslclient.pyc similarity index 100% rename from func/overlord/sslclient.pyc rename to certmaster/overlord/sslclient.pyc diff --git a/func/overlord/test_func.py b/certmaster/overlord/test_func.py similarity index 100% rename from func/overlord/test_func.py rename to certmaster/overlord/test_func.py diff --git a/func/utils.py b/certmaster/utils.py similarity index 100% rename from func/utils.py rename to certmaster/utils.py diff --git a/docs/certmaster-ca.pod b/docs/certmaster-ca.pod index fce3f73..0b95b4a 100644 --- a/docs/certmaster-ca.pod +++ b/docs/certmaster-ca.pod @@ -12,10 +12,7 @@ certmaster-ca --sign machine.example.org "certmaster-ca --list" -The list command prints all certificates that have been requested from certmaster by a remote -service (such as funcd) but are not yet signed. - -func commands can't be sent to a remote machine until the certificates have been signed. +The list command prints all certificates that have been requested from certmaster by a remote application (such as funcd or certmaster-request) but are not yet signed. "certmaster-ca --sign [hostname]" @@ -26,16 +23,16 @@ This command is used to sign a certificate and send it back to the requester. The certmaster can be configured to make this command unneccessary; all incoming requests can be signed automatically by certmaster. -To configure this, edit /etc/func/certmaster.conf. +To configure this, edit /etc/certmaster/certmaster.conf. =head1 ADDITONAL RESOURCES -See https://hosted.fedoraproject.org/projects/func/. It's a Wiki. +See https://fedorahosted.org/certmaster. It's a Wiki. -See also the manpages for "func", "func-inventory", "funcd", and "certmaster". +See also the manpages for "certmaster" and "certmaster-request". =head1 AUTHOR -Various. See https://hosted.fedoraproject.org/projects/func +Various. See https://fedorahosted.org/certmaster diff --git a/docs/certmaster-request.pod b/docs/certmaster-request.pod new file mode 100644 index 0000000..1a7bf4a --- /dev/null +++ b/docs/certmaster-request.pod @@ -0,0 +1,36 @@ +=head1 NAME + +certmaster-request -- requests SSL certs from a certmasster +Fedora Unified Network Controller. + +=head1 SYNOPSIS + +certmaster-request [--server certmaster.example.com] [--port port] +[ --wait infinite/seconds ] + +=head1 DESCRIPTION + +FIXME: To be added later once we split this out from func. + +=head1 API + +Note: Many applications will want to use the XMLRPC API (see source) or import +the Python code to request certs. For those that don't want to do that, +this command line tool is available. Explore the other options if they +make more sense for your application. + +=head1 EXIT_STATUS + +non-zero upon failure. + +=head1 ADDITONAL RESOURCES + +See https://fedorahosted.org/certmaster for more information + +See also the manpages for "certmaster", and "certmaster-ca". + +=head1 AUTHOR + +Various. See https://fedorahosted.org/func + + diff --git a/docs/certmaster.pod b/docs/certmaster.pod index 92f5074..08985cf 100644 --- a/docs/certmaster.pod +++ b/docs/certmaster.pod @@ -1,6 +1,7 @@ =head1 NAME -certmaster -- hands out certificates to funcd and other components. +certmaster -- hands out certificates to programs that want them, like +certmaster-request or users of the certmaster API =head1 SYNOPSIS @@ -8,19 +9,17 @@ certmaster (it's a daemon and takes no arguments) =head1 DESCRIPTION -See https://hosted.fedoraproject.org/projects/func/ +See https://fedorahosted.org/certmaster -Certmaster is run on the master-control machine on a network being -controlled by func. It hands out certificates to machines running -funcd. +Certmaster is a daemon that runs on a "master" machine to hand out certificates to machines that want them. Certificates can then be used by applications like func. -Certmaster is configured by /etc/func/certmaster.conf +Certmaster is configured by /etc/certmaster/certmaster.conf =head1 ADDITONAL RESOURCES -See https://hosted.fedoraproject.org/projects/func/. It's a Wiki. +See https://fedorahosted.org/certmaster/. It's a Wiki. -See also the manpages for "func", "func-inventory", "funcd", "certmaster-ca". +See also the manpages for "certmaster-request" and "certmaster-ca". =head1 AUTHOR diff --git a/docs/func-inventory.pod b/docs/func-inventory.pod deleted file mode 100644 index cfe362d..0000000 --- a/docs/func-inventory.pod +++ /dev/null @@ -1,70 +0,0 @@ -=head1 NAME - -func-inventory -- Takes inventory of data from func minions, and stores them in git. - -=head1 SYNOPSIS - -func-inventory [--verbose] [--server-spec glob] [--methods list] [--modules list] [--tree path] [--no-git] - -=head1 DESCRIPTION - -func-inventory runs against func-minions to gather information, and stores this information on the filesystem, in a tree arranged by hostname, module name, and method name. - -After each update, differences are commited to version control (using git), where they can be examined with tools such as "git log" and "gitk". - -=head1 --verbose - -Provides extra output about what func-inventory is doing. - -=head1 --server-spec - -A glob, as can be given to "func", that describes what machines the inventory program should run against. The default is "*". - -=head1 --modules list - -A comma-seperated list of modules that should be included in the inventory, for instance "hardware,packages". -The default is "all". - -=head1 --methods list - -A comma-seperated list of methods that should be included in the inventory, for each module being queried. The default -is "info", which saves the data for any module that has an "info" method. - -=head1 --tree-path - -Selects the location where func-inventory will output data. The default is /var/lib/func/inventory. This directory will -contain a tree structure based on the hostnames, modules, and methods included in the inventory. - -=head1 --no-git - -Disables git integration, meaning changes will not be tracked using version control. This option is present -for those that do not have the "git-core" package installed, though installing it is highly recommended to get -the full degree of power out of func-inventory. - -=head1 VIEWING CHANGES - -Since func-inventory integrates with git, all changes to the remote systems (including additions of new systems) can -be tracked using standard git-tools such as "git log" and "gitk", when run on the directory specified for --tree. - -Additional built in hooks to notify changes can be written using git's own trigger mechanism, though something -more specific to func will likely be developed in the future -- also eliminating the need to grok git internals. - -=head1 ALTERNATIVE OUTPUT FORMATS - -func-inventory can be passed a --json or --xmlrpc parameter to override the default output format. These -output formats are much less readable in the git-produced diffs, but are more easily loaded by other programs -that may want to "mine" the output of a func-inventory tree. Using --json requires that the python-simplejson -RPM be installed. - -=head1 ADDITONAL RESOURCES - -See https://hosted.fedoraproject.org/projects/func/ for more information. - -See also the manpages for "func", "funcd", "certmaster", and "certmaster-ca". - -=head1 AUTHOR - -Michael DeHaan - - - diff --git a/docs/func.pod b/docs/func.pod deleted file mode 100644 index 5ee594b..0000000 --- a/docs/func.pod +++ /dev/null @@ -1,111 +0,0 @@ -=head1 NAME - -Func -- Fedora Unified Network Controller. - -=head1 SYNOPSIS - -func "*" list_minions - -func target.example.org call module method [args ...] - -func "target*.example.org" call module method [args ...] - -func "webserver1;mailserver2" call module method [args ...] - -=head1 DESCRIPTION - -"func" allows remote control of machines running funcd (called "minions") -that are set to obey this machine (called the "overlord"). This includes -performing various remote operations and gathering data. - -"func" can address multiple machines at the same time by specifying -their names with globs, which follow shell glob syntax. - -See the project homepage (below) for a list of modules available -and a more in-depth description of what each of them do. - -=head1 THE "CALL" MODULE - -The "call" module is used for running func modules remotely. - -Format: func "*.example.org" call [ args ... ] - -=head1 LISTING REMOTE MODULES AVAILABLE - -It's possible to ask func minions what modules they have installed: - -func "*.example.org" call system list_modules - -=head1 LISTING REMOTE FUNCTIONS AVAILABLE IN A MODULE - -It is also possible to ask remote func modules what functions they support: - -func target.example.org call modulename list_methods - -=head1 CALLING A REMOTE COMMAND - -Once you have the name of a module you want to run, use call to invoke it: - -func target.example.org call modulename methodname - -=head1 OUTPUT FORMATS - -The "call" command by default outputs data using a "pretty printer". Other -display options include --raw, --json, and --xmlrpc, which may be more -desirable if you are running func inside another script or prefer to read -those display formats. - -Example: func "*" call --json service inventory - - -=head1 HELPER MODULES - -In addition to "call", there are other modules that make control of remote -machines, as well as data display, more user friendly. They augment "call" -by providing some additional functionality. - -You will notice that the syntax for using one of these helper modules -varies slightly from just using "call" directly. - -For example "show" can be used to show remote data. The normal command "func '*' -command would dump a very large amount of data, while the show command can mine -only a few details. This might make things more readable, for instance, when -not going through the Python API (where you would not care). - -func "*.example.org" show hardware --help - -func "*.example.org" show hardware systemMemory - -func "*.example.org" show hardware os - -Another useful helper command module is copyfile, which allows func to work like scp from -the shell, though it can address multiple systems at the same time. - -The following example pushes one file out to multiple systems: - -func "*.example.org" copyfile --file=/tmp/foo --remotepath=/tmp/foo - -While these helper modules will grow over time, usage of "call" syntax -directly is fine also. See the Wiki for more examples as they evolve. - -=head1 --verbose - -Use this flag to output extra information from func while it is running. -All func commands can take this flag. - -=head1 EXIT_STATUS - -Func commands have return values that vary based on the module being -called. See the project page (linked below) for more information. - -=head1 ADDITONAL RESOURCES - -See https://hosted.fedoraproject.org/projects/func/ for more information, including information on scripting func from Python. - -See also the manpages for "func-inventory", "funcd", "certmaster", and "certmaster-ca". - -=head1 AUTHOR - -Various. See https://hosted.fedoraproject.org/projects/func - - diff --git a/docs/funcd.pod b/docs/funcd.pod deleted file mode 100644 index da4ec75..0000000 --- a/docs/funcd.pod +++ /dev/null @@ -1,25 +0,0 @@ -=head1 NAME - -funcd -- deaemon for the Fedora Universal Network Controller - -=head1 SYNOPSIS - -funcd (it's a daemon and takes no arguments) - -=head1 DESCRIPTION - -funcd registers itself to a certificate server (certmaster) listed in /etc/func/minion.conf and takes orders from the command line func when that program is run from that certificate server. See /etc/func/minion.conf for other configuration options. - -Modules and capabilities provided by funcd are specified at https://hosted.fedoraproject.org/projects/func/ - -=head1 ADDITONAL RESOURCES - -See https://hosted.fedoraproject.org/projects/func/. It's a Wiki. - -See also the manpages for "func", "certmaster", and "certmaster-ca". - -=head1 AUTHOR - -Various. See https://hosted.fedoraproject.org/projects/func - - diff --git a/etc/func_rotate b/etc/certmaster_rotate similarity index 100% rename from etc/func_rotate rename to etc/certmaster_rotate diff --git a/etc/sample.acl b/etc/sample.acl deleted file mode 100644 index 1a093a8..0000000 --- a/etc/sample.acl +++ /dev/null @@ -1,5 +0,0 @@ -#config file for minion Access control lists -#this specifies which methods a connecting client is allowed to run -# format is: cn-certificate-hash = method1, method2, method3 -# default allows the certmaster key to run all methods - diff --git a/init-scripts/funcd b/init-scripts/funcd deleted file mode 100755 index 63b98a2..0000000 --- a/init-scripts/funcd +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/sh -# -# funcd Fedora Unified Network Control -################################### - -# LSB header - -### BEGIN INIT INFO -# Provides: funcd -# Required-Start: network -# Required-Stop: -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Fedora Unified Network Control -# Description: Crazy simple, secure remote management. -### END INIT INFO - -# chkconfig header - -# chkconfig: - 99 99 -# description: Crazy simple, secure remote management. -# -# processname: /usr/bin/funcd - -# Sanity checks. -[ -x /usr/bin/funcd ] || exit 0 - -SERVICE=funcd -PROCESS=funcd -DAEMON=/usr/bin/funcd -CONFIG_ARGS="--daemon" - - -FuncStatus() -{ - ps wt? | grep "$DAEMON" 2>&1 > /dev/null - if [ "x$?" = "x0" ]; then - RVAL=0 - echo "$DAEMON is running" - else - RVAL=3 - echo "$DAEMON is not running" - fi -} - -if [ -f /lib/lsb/init-functions ]; then - . /lib/lsb/init-functions - alias START_DAEMON=start_daemon - alias STATUS=FuncStatus - alias LOG_SUCCESS=log_success_msg - alias LOG_FAILURE=log_failure_msg - alias LOG_WARNING=log_warning_msg -elif [ -f /etc/init.d/functions ]; then - . /etc/init.d/functions - alias START_DAEMON=daemon - alias STATUS=status - alias LOG_SUCCESS=success - alias LOG_FAILURE=failure - alias LOG_WARNING=passed -else - echo "Error: your platform is not supported by $0" > /dev/stderr - exit 1 -fi - - -RETVAL=0 - -start() { - echo -n $"Starting func daemon: " - START_DAEMON $PROCESS $CONFIG_ARGS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE - return $RETVAL -} - -stop() { - echo -n $"Stopping func daemon: " - killproc $PROCESS - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$SERVICE - rm -f /var/run/$SERVICE.pid - fi -} - -restart() { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart) - $1 - ;; - status) - STATUS $PROCESS - RETVAL=$? - ;; - condrestart) - [ -f /var/lock/subsys/$SERVICE ] && restart || : - ;; - reload) - echo "can't reload configuration, you have to restart it" - RETVAL=$? - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" - exit 1 - ;; -esac -exit $RETVAL - diff --git a/scripts/funcd b/scripts/certmaster-request similarity index 100% rename from scripts/funcd rename to scripts/certmaster-request diff --git a/scripts/func b/scripts/func deleted file mode 100755 index 925d6ad..0000000 --- a/scripts/func +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/python - -import sys -import distutils.sysconfig - -# sys.path.append("%s/func" % distutils.sysconfig.get_python_lib()) - -import func.overlord.func_command as func_command - -myname, argv = sys.argv[0], sys.argv[1:] -cli = func_command.FuncCommandLine() -cli.parse(argv) - - diff --git a/scripts/func-create-module b/scripts/func-create-module deleted file mode 100755 index f2885e8..0000000 --- a/scripts/func-create-module +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2008, Red Hat, Inc -# Steve 'Ashcrow' Milner -# John Eckersberg -# -# This software may be freely redistributed under the terms of the GNU -# general public license. -# -# 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., 675 Mass Ave, Cambridge, MA 02139, USA. - -TEMPLATE = """\ -# -# Copyright %s -# %s <%s> -# -# This software may be freely redistributed under the terms of the GNU -# general public license. -# -# 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., 675 Mass Ave, Cambridge, MA 02139, USA. - -import func_module - -class %s(func_module.FuncModule): - - # Update these if need be. - version = "0.0.1" - api_version = "0.0.1" - description = "%s" - -%s -""" - -METHOD_TEMPLATE = '''\ - def %s(self): - """ - TODO: Document me ... - """ - pass - -''' - - -def populate_template(author_name, author_email, module_name, desc, methods): - """ - Makes the method strings and populates the template. - """ - from datetime import datetime - - actual_methods = "" - for method in methods: - actual_methods += METHOD_TEMPLATE % method - return TEMPLATE % (datetime.now().strftime("%Y"), author_name, - author_email, module_name, desc, actual_methods[:-2]) - - -if __name__ == '__main__': - module_name = raw_input("Module Name: ").capitalize() - desc = raw_input("Description: ") - author_name = raw_input("Author: ") - author_email = raw_input("Email: ") - methods = [] - print "\nLeave blank to finish." - while True: - method = raw_input("Method: ") - if method == '': - break - methods.append(method) - # Write it out to a file - file_name = "%s.py" % module_name.lower() - file_obj = open(file_name, "w") - file_obj.write(populate_template(author_name, author_email, - module_name, desc, methods)) - file_obj.close() - print "Your module is ready to be hacked on. Wrote out to %s." % file_name diff --git a/scripts/func-inventory b/scripts/func-inventory deleted file mode 100755 index 1a0c36b..0000000 --- a/scripts/func-inventory +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/python - -import sys -import distutils.sysconfig -import func.overlord.inventory as func_inventory - -inventory = func_inventory.FuncInventory() -inventory.run(sys.argv) diff --git a/version b/version index 06da242..084a74c 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.16 1 +0.1 1 -- 2.39.2