Misc s/func/certmaster/ replacements

diff --git a/init-scripts/certmaster b/init-scripts/certmaster
index 819ba0d..95c16fc 100755 (executable)
--- a/init-scripts/certmaster
+++ b/init-scripts/certmaster
@@ -11,13 +11,13 @@
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 # Short-Description: certificate master for Fedora Unified Network Control 'master server only'
-# Description: certificate master to sign/manage ca/cert infrastructure for func
+# Description: certificate master to sign/manage ca/cert infrastructure
 ### END INIT INFO
 
 # chkconfig header
 
 # chkconfig: - 98 99 
-# description:  certificate master to sign/manage ca/cert infrastructure for func
+# description:  certificate master to sign/manage ca/cert infrastructure
 #
 # processname: /usr/bin/certmaster
 

diff --git a/scripts/certmaster b/scripts/certmaster
index d5f677d..d9e99fd 100755 (executable)
--- a/scripts/certmaster
+++ b/scripts/certmaster
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from func import certmaster
+from certmaster import certmaster
 
 import sys
 

diff --git a/scripts/certmaster-ca b/scripts/certmaster-ca
index b3e844a..a504d20 100755 (executable)
--- a/scripts/certmaster-ca
+++ b/scripts/certmaster-ca
@@ -9,9 +9,9 @@ import sys
 import glob
 import os
 
-import func
-import func.certs
-import func.certmaster
+import certmaster
+import certmaster.certs
+import certmaster.certmaster
 
 
 
@@ -46,7 +46,7 @@ def main(args):
         errorprint('Must be root to run certmaster-ca')
         return 1
         
-    cm = func.certmaster.CertMaster()
+    cm = certmaster.certmaster.CertMaster()
     
     (opts, args) = parseargs(args)
 

diff --git a/scripts/certmaster-request b/scripts/certmaster-request
index 3d807bd..c731fdb 100755 (executable)
--- a/scripts/certmaster-request
+++ b/scripts/certmaster-request
@@ -4,7 +4,9 @@
 import sys
 import distutils.sysconfig
 
-from func.minion import server
+print "This app is not implemented yet!"
 
-if __name__ == "__main__":
-    server.main(sys.argv)
+# from func.minion import server
+#
+#if __name__ == "__main__":
+#    server.main(sys.argv)