Carving away at func some more to just get down to cert items, still lots

more to do.

95 files changed, 49 insertions, 444 deletions

diff --git a/func/CommonErrors.py b/certmaster/CommonErrors.py
index c76cb3d..c76cb3d 100644
--- a/func/CommonErrors.py
+++ b/certmaster/CommonErrors.py
diff --git a/func/Makefile b/certmaster/Makefile
index 99fd546..99fd546 100755
--- a/func/Makefile
+++ b/certmaster/Makefile
diff --git a/func/SSLCommon.py b/certmaster/SSLCommon.py
index 6959749..6959749 100644
--- a/func/SSLCommon.py
+++ b/certmaster/SSLCommon.py
diff --git a/func/SSLConnection.py b/certmaster/SSLConnection.py
index 98ed8a0..98ed8a0 100644
--- a/func/SSLConnection.py
+++ b/certmaster/SSLConnection.py
diff --git a/func/__init__.py b/certmaster/__init__.py
index e69de29..e69de29 100644
--- a/func/__init__.py
+++ b/certmaster/__init__.py
diff --git a/func/certmaster.py b/certmaster/certmaster.py
index fe5dcbc..fe5dcbc 100755
--- a/func/certmaster.py
+++ b/certmaster/certmaster.py
diff --git a/func/certs.py b/certmaster/certs.py
index 4d6bf15..4d6bf15 100644
--- a/func/certs.py
+++ b/certmaster/certs.py
diff --git a/func/codes.py b/certmaster/codes.py
index c6bcb61..c6bcb61 100755
--- a/func/codes.py
+++ b/certmaster/codes.py
diff --git a/func/commonconfig.py b/certmaster/commonconfig.py
index 9fd3356..9fd3356 100644
--- a/func/commonconfig.py
+++ b/certmaster/commonconfig.py
diff --git a/func/config.py b/certmaster/config.py
index 8202457..8202457 100644
--- a/func/config.py
+++ b/certmaster/config.py
diff --git a/func/forkbomb.py b/certmaster/forkbomb.py
index 3dfa6f2..3dfa6f2 100644
--- a/func/forkbomb.py
+++ b/certmaster/forkbomb.py
diff --git a/func/jobthing.py b/certmaster/jobthing.py
index 67ad1a6..67ad1a6 100644
--- a/func/jobthing.py
+++ b/certmaster/jobthing.py
diff --git a/func/logger.py b/certmaster/logger.py
index e679f3d..e679f3d 100755
--- a/func/logger.py
+++ b/certmaster/logger.py
diff --git a/func/minion/AuthedXMLRPCServer.py b/certmaster/minion/AuthedXMLRPCServer.py
index 0ec9ce0..0ec9ce0 100644
--- a/func/minion/AuthedXMLRPCServer.py
+++ b/certmaster/minion/AuthedXMLRPCServer.py
diff --git a/func/minion/Makefile b/certmaster/minion/Makefile
index d630382..d630382 100755
--- a/func/minion/Makefile
+++ b/certmaster/minion/Makefile
diff --git a/func/minion/__init__.py b/certmaster/minion/__init__.py
index e69de29..e69de29 100644
--- a/func/minion/__init__.py
+++ b/certmaster/minion/__init__.py
diff --git a/func/minion/codes.py b/certmaster/minion/codes.py
index a20c95e..a20c95e 100755
--- a/func/minion/codes.py
+++ b/certmaster/minion/codes.py
diff --git a/func/minion/module_loader.py b/certmaster/minion/module_loader.py
index 3068ea8..3068ea8 100755
--- a/func/minion/module_loader.py
+++ b/certmaster/minion/module_loader.py
diff --git a/func/minion/modules/Makefile b/certmaster/minion/modules/Makefile
index f2bc6c4..f2bc6c4 100755
--- a/func/minion/modules/Makefile
+++ b/certmaster/minion/modules/Makefile
diff --git a/func/minion/modules/__init__.py b/certmaster/minion/modules/__init__.py
index e69de29..e69de29 100644
--- a/func/minion/modules/__init__.py
+++ b/certmaster/minion/modules/__init__.py
diff --git a/func/minion/modules/certmaster.py b/certmaster/minion/modules/certmaster.py
index 9ca484f..9ca484f 100644
--- a/func/minion/modules/certmaster.py
+++ b/certmaster/minion/modules/certmaster.py
diff --git a/func/minion/modules/command.py b/certmaster/minion/modules/command.py
index cc463cf..cc463cf 100644
--- a/func/minion/modules/command.py
+++ b/certmaster/minion/modules/command.py
diff --git a/func/minion/modules/copyfile.py b/certmaster/minion/modules/copyfile.py
index 150af88..150af88 100644
--- a/func/minion/modules/copyfile.py
+++ b/certmaster/minion/modules/copyfile.py
diff --git a/func/minion/modules/filetracker.py b/certmaster/minion/modules/filetracker.py
index f5f9dbb..f5f9dbb 100644
--- a/func/minion/modules/filetracker.py
+++ b/certmaster/minion/modules/filetracker.py
diff --git a/func/minion/modules/func_module.py b/certmaster/minion/modules/func_module.py
index 7d476dc..7d476dc 100644
--- a/func/minion/modules/func_module.py
+++ b/certmaster/minion/modules/func_module.py
diff --git a/func/minion/modules/func_module.py.orig b/certmaster/minion/modules/func_module.py.orig
index c911b91..c911b91 100644
--- a/func/minion/modules/func_module.py.orig
+++ b/certmaster/minion/modules/func_module.py.orig
diff --git a/func/minion/modules/hardware.py b/certmaster/minion/modules/hardware.py
index 46b1821..46b1821 100644
--- a/func/minion/modules/hardware.py
+++ b/certmaster/minion/modules/hardware.py
diff --git a/func/minion/modules/jobs.py b/certmaster/minion/modules/jobs.py
index 69fb75f..69fb75f 100644
--- a/func/minion/modules/jobs.py
+++ b/certmaster/minion/modules/jobs.py
diff --git a/func/minion/modules/mount.py b/certmaster/minion/modules/mount.py
index 0db914f..0db914f 100644
--- a/func/minion/modules/mount.py
+++ b/certmaster/minion/modules/mount.py
diff --git a/func/minion/modules/nagios-check.py b/certmaster/minion/modules/nagios-check.py
index f1c0714..f1c0714 100644
--- a/func/minion/modules/nagios-check.py
+++ b/certmaster/minion/modules/nagios-check.py
diff --git a/func/minion/modules/netapp/README b/certmaster/minion/modules/netapp/README
index 5ecb205..5ecb205 100644
--- a/func/minion/modules/netapp/README
+++ b/certmaster/minion/modules/netapp/README
diff --git a/func/minion/modules/netapp/TODO b/certmaster/minion/modules/netapp/TODO
index 25d914c..25d914c 100644
--- a/func/minion/modules/netapp/TODO
+++ b/certmaster/minion/modules/netapp/TODO
diff --git a/func/minion/modules/netapp/__init__.py b/certmaster/minion/modules/netapp/__init__.py
index e69de29..e69de29 100644
--- a/func/minion/modules/netapp/__init__.py
+++ b/certmaster/minion/modules/netapp/__init__.py
diff --git a/func/minion/modules/netapp/common.py b/certmaster/minion/modules/netapp/common.py
index 979c95c..979c95c 100644
--- a/func/minion/modules/netapp/common.py
+++ b/certmaster/minion/modules/netapp/common.py
diff --git a/func/minion/modules/netapp/snap.py b/certmaster/minion/modules/netapp/snap.py
index 8f3f209..8f3f209 100644
--- a/func/minion/modules/netapp/snap.py
+++ b/certmaster/minion/modules/netapp/snap.py
diff --git a/func/minion/modules/netapp/vol/__init__.py b/certmaster/minion/modules/netapp/vol/__init__.py
index 14ce0ac..14ce0ac 100644
--- a/func/minion/modules/netapp/vol/__init__.py
+++ b/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
index 715d8a8..715d8a8 100644
--- a/func/minion/modules/netapp/vol/clone.py
+++ b/certmaster/minion/modules/netapp/vol/clone.py
diff --git a/func/minion/modules/networktest.py b/certmaster/minion/modules/networktest.py
index 0e6fbb2..0e6fbb2 100644
--- a/func/minion/modules/networktest.py
+++ b/certmaster/minion/modules/networktest.py
diff --git a/func/minion/modules/process.py b/certmaster/minion/modules/process.py
index 848e847..848e847 100644
--- a/func/minion/modules/process.py
+++ b/certmaster/minion/modules/process.py
diff --git a/func/minion/modules/process.py.orig b/certmaster/minion/modules/process.py.orig
index bdd5193..bdd5193 100644
--- a/func/minion/modules/process.py.orig
+++ b/certmaster/minion/modules/process.py.orig
diff --git a/func/minion/modules/reboot.py b/certmaster/minion/modules/reboot.py
index c4fb275..c4fb275 100644
--- a/func/minion/modules/reboot.py
+++ b/certmaster/minion/modules/reboot.py
diff --git a/func/minion/modules/rpms.py b/certmaster/minion/modules/rpms.py
index ae26cb4..ae26cb4 100644
--- a/func/minion/modules/rpms.py
+++ b/certmaster/minion/modules/rpms.py
diff --git a/func/minion/modules/service.py b/certmaster/minion/modules/service.py
index 062aea5..062aea5 100644
--- a/func/minion/modules/service.py
+++ b/certmaster/minion/modules/service.py
diff --git a/func/minion/modules/smart.py b/certmaster/minion/modules/smart.py
index f410f09..f410f09 100644
--- a/func/minion/modules/smart.py
+++ b/certmaster/minion/modules/smart.py
diff --git a/func/minion/modules/snmp.py b/certmaster/minion/modules/snmp.py
index c992db1..c992db1 100644
--- a/func/minion/modules/snmp.py
+++ b/certmaster/minion/modules/snmp.py
diff --git a/func/minion/modules/sysctl.py b/certmaster/minion/modules/sysctl.py
index 1f11d55..1f11d55 100644
--- a/func/minion/modules/sysctl.py
+++ b/certmaster/minion/modules/sysctl.py
diff --git a/func/minion/modules/test.py b/certmaster/minion/modules/test.py
index 6f7c5fa..6f7c5fa 100644
--- a/func/minion/modules/test.py
+++ b/certmaster/minion/modules/test.py
diff --git a/func/minion/modules/virt.py b/certmaster/minion/modules/virt.py
index 04d36bd..04d36bd 100644
--- a/func/minion/modules/virt.py
+++ b/certmaster/minion/modules/virt.py
diff --git a/func/minion/modules/yumcmd.py b/certmaster/minion/modules/yumcmd.py
index f952372..f952372 100644
--- a/func/minion/modules/yumcmd.py
+++ b/certmaster/minion/modules/yumcmd.py
diff --git a/func/minion/server.py b/certmaster/minion/server.py
index f1b827f..f1b827f 100755
--- a/func/minion/server.py
+++ b/certmaster/minion/server.py
diff --git a/func/minion/sub_process.py b/certmaster/minion/sub_process.py
index 351a951..351a951 100644
--- a/func/minion/sub_process.py
+++ b/certmaster/minion/sub_process.py
diff --git a/func/minion/utils.py b/certmaster/minion/utils.py
index a7ea788..a7ea788 100755
--- a/func/minion/utils.py
+++ b/certmaster/minion/utils.py
diff --git a/func/overlord/.forkbomb.py.swp b/certmaster/overlord/.forkbomb.py.swp
index 242b6f4..242b6f4 100644
--- a/func/overlord/.forkbomb.py.swp
+++ b/certmaster/overlord/.forkbomb.py.swp
diff --git a/func/overlord/Makefile b/certmaster/overlord/Makefile
index f2bc6c4..f2bc6c4 100755
--- a/func/overlord/Makefile
+++ b/certmaster/overlord/Makefile
diff --git a/func/overlord/__init__.py b/certmaster/overlord/__init__.py
index e69de29..e69de29 100644
--- a/func/overlord/__init__.py
+++ b/certmaster/overlord/__init__.py
diff --git a/func/overlord/__init__.pyc b/certmaster/overlord/__init__.pyc
index f74bc59..f74bc59 100644
--- a/func/overlord/__init__.pyc
+++ b/certmaster/overlord/__init__.pyc
diff --git a/func/overlord/client.py b/certmaster/overlord/client.py
index cf1009c..cf1009c 100755
--- a/func/overlord/client.py
+++ b/certmaster/overlord/client.py
diff --git a/func/overlord/client.pyc b/certmaster/overlord/client.pyc
index 5c7874e..5c7874e 100644
--- a/func/overlord/client.pyc
+++ b/certmaster/overlord/client.pyc
diff --git a/func/overlord/cmd_modules/__init__.py b/certmaster/overlord/cmd_modules/__init__.py
index e69de29..e69de29 100644
--- a/func/overlord/cmd_modules/__init__.py
+++ b/certmaster/overlord/cmd_modules/__init__.py
diff --git a/func/overlord/cmd_modules/__init__.pyc b/certmaster/overlord/cmd_modules/__init__.pyc
index 287b354..287b354 100644
--- a/func/overlord/cmd_modules/__init__.pyc
+++ b/certmaster/overlord/cmd_modules/__init__.pyc
diff --git a/func/overlord/cmd_modules/call.py b/certmaster/overlord/cmd_modules/call.py
index 7add5bf..7add5bf 100644
--- a/func/overlord/cmd_modules/call.py
+++ b/certmaster/overlord/cmd_modules/call.py
diff --git a/func/overlord/cmd_modules/call.pyc b/certmaster/overlord/cmd_modules/call.pyc
index f6c588d..f6c588d 100644
--- a/func/overlord/cmd_modules/call.pyc
+++ b/certmaster/overlord/cmd_modules/call.pyc
diff --git a/func/overlord/cmd_modules/copyfile.py b/certmaster/overlord/cmd_modules/copyfile.py
index 295aeab..295aeab 100644
--- a/func/overlord/cmd_modules/copyfile.py
+++ b/certmaster/overlord/cmd_modules/copyfile.py
diff --git a/func/overlord/cmd_modules/listminions.py b/certmaster/overlord/cmd_modules/listminions.py
index 50c7e24..50c7e24 100644
--- a/func/overlord/cmd_modules/listminions.py
+++ b/certmaster/overlord/cmd_modules/listminions.py
diff --git a/func/overlord/cmd_modules/ping.py b/certmaster/overlord/cmd_modules/ping.py
index f756fd9..f756fd9 100644
--- a/func/overlord/cmd_modules/ping.py
+++ b/certmaster/overlord/cmd_modules/ping.py
diff --git a/func/overlord/cmd_modules/show.py b/certmaster/overlord/cmd_modules/show.py
index e1df554..e1df554 100644
--- a/func/overlord/cmd_modules/show.py
+++ b/certmaster/overlord/cmd_modules/show.py
diff --git a/func/overlord/command.py b/certmaster/overlord/command.py
index 7fb7de4..7fb7de4 100644
--- a/func/overlord/command.py
+++ b/certmaster/overlord/command.py
diff --git a/func/overlord/command.pyc b/certmaster/overlord/command.pyc
index 6fa44e8..6fa44e8 100644
--- a/func/overlord/command.pyc
+++ b/certmaster/overlord/command.pyc
diff --git a/func/overlord/forkbomb.pyc b/certmaster/overlord/forkbomb.pyc
index 308557d..308557d 100644
--- a/func/overlord/forkbomb.pyc
+++ b/certmaster/overlord/forkbomb.pyc
diff --git a/func/overlord/func_command.py b/certmaster/overlord/func_command.py
index 4cec8a0..4cec8a0 100644
--- a/func/overlord/func_command.py
+++ b/certmaster/overlord/func_command.py
diff --git a/func/overlord/func_command.pyc b/certmaster/overlord/func_command.pyc
index 1834e0e..1834e0e 100644
--- a/func/overlord/func_command.pyc
+++ b/certmaster/overlord/func_command.pyc
diff --git a/func/overlord/groups.py b/certmaster/overlord/groups.py
index 8eaf28e..8eaf28e 100644
--- a/func/overlord/groups.py
+++ b/certmaster/overlord/groups.py
diff --git a/func/overlord/groups.pyc b/certmaster/overlord/groups.pyc
index 9ed2a92..9ed2a92 100644
--- a/func/overlord/groups.pyc
+++ b/certmaster/overlord/groups.pyc
diff --git a/func/overlord/highlevel.py b/certmaster/overlord/highlevel.py
index 977dcb4..977dcb4 100644
--- a/func/overlord/highlevel.py
+++ b/certmaster/overlord/highlevel.py
diff --git a/func/overlord/inventory.py b/certmaster/overlord/inventory.py
index 8302a1c..8302a1c 100755
--- a/func/overlord/inventory.py
+++ b/certmaster/overlord/inventory.py
diff --git a/func/overlord/jobthing.pyc b/certmaster/overlord/jobthing.pyc
index cba36cb..cba36cb 100644
--- a/func/overlord/jobthing.pyc
+++ b/certmaster/overlord/jobthing.pyc
diff --git a/func/overlord/modules/netapp.py b/certmaster/overlord/modules/netapp.py
index 987901e..987901e 100644
--- a/func/overlord/modules/netapp.py
+++ b/certmaster/overlord/modules/netapp.py
diff --git a/func/overlord/sslclient.py b/certmaster/overlord/sslclient.py
index 3861bb8..3861bb8 100755
--- a/func/overlord/sslclient.py
+++ b/certmaster/overlord/sslclient.py
diff --git a/func/overlord/sslclient.pyc b/certmaster/overlord/sslclient.pyc
index fdc21f2..fdc21f2 100644
--- a/func/overlord/sslclient.pyc
+++ b/certmaster/overlord/sslclient.pyc
diff --git a/func/overlord/test_func.py b/certmaster/overlord/test_func.py
index 2b3f041..2b3f041 100755
--- a/func/overlord/test_func.py
+++ b/certmaster/overlord/test_func.py
diff --git a/func/utils.py b/certmaster/utils.py
index 54c9c39..54c9c39 100755
--- a/func/utils.py
+++ b/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 <mdehaan@redhat.com>
-
-
-
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 <module> <function> [ 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
index e12edfb..e12edfb 100644
--- a/etc/func_rotate
+++ b/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
index 3d807bd..3d807bd 100755
--- a/scripts/funcd
+++ b/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 <smilner@redhat.com>
-# John Eckersberg <jeckersb@redhat.com>
-#
-# 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