summaryrefslogtreecommitdiffstats
path: root/func/minion
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2008-07-24 17:27:45 -0400
committerAdrian Likins <alikins@redhat.com>2008-07-24 17:27:45 -0400
commitf0db93d1f70eb2ee2f06fdf1bf5a648517aa697b (patch)
tree0abc3bafc2801c1fa8e7988e8c3bd04dbb02f415 /func/minion
parent2cf553e9375110f7c15b1785bc95b37c07592750 (diff)
aiee. missed some uses of "func.config". Fix those to use certmaster.config
also missed a use of SSLCommon. darn grep, must be broken. Yeah, thats it, grep screw up. Nope, not me. Not me at all.
Diffstat (limited to 'func/minion')
-rw-r--r--func/minion/modules/func_module.py2
-rwxr-xr-xfunc/minion/server.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/func/minion/modules/func_module.py b/func/minion/modules/func_module.py
index d75cb33..56f21f9 100644
--- a/func/minion/modules/func_module.py
+++ b/func/minion/modules/func_module.py
@@ -13,7 +13,7 @@
import inspect
from func import logger
-from func.config import read_config, BaseConfig
+from certmaster.config import read_config, BaseConfig
from func.commonconfig import FuncdConfig
from func.minion.func_arg import * #the arg getter stuff
diff --git a/func/minion/server.py b/func/minion/server.py
index 36f3262..ede0640 100755
--- a/func/minion/server.py
+++ b/func/minion/server.py
@@ -23,7 +23,7 @@ from gettext import textdomain
I18N_DOMAIN = "func"
-from func.config import read_config
+from certmaster.config import read_config
from func.commonconfig import FuncdConfig
from certmaster.commonconfig import CMConfig
from func import logger