move logger and config_data to func/func

update modules that need new location

modules/func_module.py: update to use new logger/config locations,
	also go ahead and register as a real module, to shut up the
	start up. It shouldn't hurt anything

Some minor import reordering at a couple places (I try to keep
at least system import alphabetical)

2 files changed, 11 insertions, 6 deletions

diff --git a/minion/server.py b/minion/server.py
index 03c4fa5..ce9df41 100755
--- a/minion/server.py
+++ b/minion/server.py
@@ -24,11 +24,15 @@ import socket
 from rhpl.translate import textdomain
 I18N_DOMAIN = "func"
 
+
+from func import config_data
+from func import logger
+
 # our modules
 import AuthedXMLRPCServer
 import codes
-import config_data
-import logger
+#import config_data
+#import logger
 import module_loader
 import utils
 
diff --git a/minion/utils.py b/minion/utils.py
index 307141f..177d4ee 100755
--- a/minion/utils.py
+++ b/minion/utils.py
@@ -13,16 +13,17 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 """
 
 import os
+import socket
 import string
 import sys
+import time
 import traceback
 import xmlrpclib
-from func import certs
+
 import codes
-import socket
-import time
 
-import config_data
+from func import certs
+from func import config_data