Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func

7 files changed, 26 insertions, 21 deletions

diff --git a/func/certmaster.py b/func/certmaster.py
index 101a035..557cfdb 100755
--- a/func/certmaster.py
+++ b/func/certmaster.py
@@ -31,14 +31,7 @@ import certs
 import codes
 import utils
 from config import BaseConfig, BoolOption, IntOption, Option, ConfigError, read_config, ListOption
-
-class CMConfig(BaseConfig):
-    listen_addr = Option('')
-    listen_port = IntOption(51235)
-    cadir = Option('/etc/pki/func/ca')
-    certroot =  Option('/var/lib/func/certmaster/certs')
-    csrroot = Option('/var/lib/func/certmaster/csrs')
-    autosign = BoolOption(False)
+from commonconfig import CMConfig
 
 class CertMaster(object):
     def __init__(self, conf_file):
diff --git a/func/commonconfig.py b/func/commonconfig.py
new file mode 100644
index 0000000..d8bc144
--- /dev/null
+++ b/func/commonconfig.py
@@ -0,0 +1,17 @@
+#!/usr/bin/python
+
+from config import BaseConfig, BoolOption, IntOption, Option, ConfigError, read_config, ListOption
+
+class CMConfig(BaseConfig):
+    listen_addr = Option('')
+    listen_port = IntOption(51235)
+    cadir = Option('/etc/pki/func/ca')
+    certroot =  Option('/var/lib/func/certmaster/certs')
+    csrroot = Option('/var/lib/func/certmaster/csrs')
+    autosign = BoolOption(False)
+
+class FuncdConfig(BaseConfig):
+    overlord_server = Option('funcmaster')
+    log_level = Option('INFO')
+    certmaster = Option('http://certmaster:51235/')
+    cert_dir = Option('/etc/pki/func')
diff --git a/func/logger.py b/func/logger.py
index 0da291c..681576e 100755
--- a/func/logger.py
+++ b/func/logger.py
@@ -17,8 +17,7 @@
 
 import logging
 from func.config import read_config
-
-from server import FuncdConfig
+from func.commonconfig import FuncdConfig
 
 
 # from the comments in http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66531
diff --git a/minion/server.py b/minion/server.py
index f930cfa..fcfe537 100755
--- a/minion/server.py
+++ b/minion/server.py
@@ -25,7 +25,8 @@ from rhpl.translate import textdomain
 I18N_DOMAIN = "func"
 
 
-from func.config import BaseConfig, BoolOption, IntOption, Option, ConfigError, read_config, ListOption
+from func.config import read_config
+from func.commonconfig import FuncdConfig
 from func import logger
 
 # our modules
@@ -34,11 +35,6 @@ import codes
 import module_loader
 import utils
 
-class FuncdConfig(BaseConfig):
-    overlord_server = Option('funcmaster')
-    log_level = Option('INFO')
-    certmaster = Option('http://certmaster:51235/')
-    cert_dir = Option('/etc/pki/func')
     
 
 class XmlRpcInterface(object):
diff --git a/minion/utils.py b/minion/utils.py
index 5d848b7..fd6eb7d 100755
--- a/minion/utils.py
+++ b/minion/utils.py
@@ -23,12 +23,12 @@ import xmlrpclib
 import codes
 import func
 from func import certs
-from func.config import BaseConfig, BoolOption, IntOption, Option, ConfigError, read_config, ListOption
-import server
+from func.config import read_config
+from func.commonconfig import FuncdConfig
 
 def create_minion_keys():
     config_file = '/etc/func/minion.conf'
-    config = read_config(config_file, server.FuncdConfig)    
+    config = read_config(config_file, FuncdConfig)    
     cert_dir = config.cert_dir
     master_uri = config.certmaster
     hn = socket.getfqdn()
diff --git a/modules/func_module.py b/modules/func_module.py
index 2f56ca0..d97377b 100755
--- a/modules/func_module.py
+++ b/modules/func_module.py
@@ -16,7 +16,7 @@
 from func import config
 from func import logger
 from func.config import read_config
-from func.server import FuncdConfig
+from func.commonconfig import FuncdConfig
 
 
 class FuncModule(object):
diff --git a/overlord/client.py b/overlord/client.py
index 0fe3908..9196ccb 100755
--- a/overlord/client.py
+++ b/overlord/client.py
@@ -18,7 +18,7 @@
 import optparse
 import sys
 import glob
-from func.certmaster import CMConfig
+from func.commonconfig import CMConfig
 from func.config import read_config
 
 import sslclient