Misc s/func/certmaster/ replacements

3 files changed, 10 insertions, 8 deletions

diff --git a/scripts/certmaster b/scripts/certmaster
index d5f677d..d9e99fd 100755
--- 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
--- 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
--- 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)