bumping version to 0.29-1

[certmaster.git] / certmaster / config.py

diff --git a/certmaster/config.py b/certmaster/config.py
index 4cf2a7f..bf9b87b 100644 (file)
--- a/certmaster/config.py
+++ b/certmaster/config.py
@@ -17,12 +17,12 @@
 
 import os
 import sys
 
 import os
 import sys

-import warnings

 import copy
 import urlparse
 from ConfigParser import NoSectionError, NoOptionError, ConfigParser
 from ConfigParser import ParsingError
 import exceptions
 import copy
 import urlparse
 from ConfigParser import NoSectionError, NoOptionError, ConfigParser
 from ConfigParser import ParsingError
 import exceptions

+import warnings

 
 CONFIG_FILE = "/etc/certmaster/certmaster.conf"
 
 
 CONFIG_FILE = "/etc/certmaster/certmaster.conf"
 


@@ -60,7 +60,7 @@ class Option(object):
         @param obj: The configuration instance to modify.
         @param objtype: The type of the config instance (not used).
         @return: The parsed option value or the default value if the value
         @param obj: The configuration instance to modify.
         @param objtype: The type of the config instance (not used).
         @return: The parsed option value or the default value if the value

-            wasn't set in the configuration file.
+            was not set in the configuration file.

         '''
         if obj is None:
             return self
         '''
         if obj is None:
             return self


@@ -448,7 +448,7 @@ class BaseConfig(object):
         self.cfg.write(fileobj)
 
     def getConfigOption(self, option, default=None):
         self.cfg.write(fileobj)
 
     def getConfigOption(self, option, default=None):

-        warnings.warn('getConfigOption() will go away in a future version of Yum.\n'
+        warnings.warn('getConfigOption() will go away in a future version of certmaster.\n'

                 'Please access option values as attributes or using getattr().',
                 DeprecationWarning)
         if hasattr(self, option):
                 'Please access option values as attributes or using getattr().',
                 DeprecationWarning)
         if hasattr(self, option):


@@ -456,7 +456,7 @@ class BaseConfig(object):
         return default
 
     def setConfigOption(self, option, value):
         return default
 
     def setConfigOption(self, option, value):

-        warnings.warn('setConfigOption() will go away in a future version of Yum.\n'
+        warnings.warn('setConfigOption() will go away in a future version of certmaster.\n'

                 'Please set option values as attributes or using setattr().',
                 DeprecationWarning)
         if hasattr(self, option):
                 'Please set option values as attributes or using setattr().',
                 DeprecationWarning)
         if hasattr(self, option):


@@ -475,4 +475,24 @@ def read_config(config_file, BaseConfigDerived):
             print >> sys.stderr, "Error reading config file: %s" % e
             sys.exit(1)
     opts.populate(confparser, 'main')
             print >> sys.stderr, "Error reading config file: %s" % e
             sys.exit(1)
     opts.populate(confparser, 'main')

+
+    ## build up the cas structure
+    opts.ca = {}
+
+    ## Add the default items when just using a single ca
+    opts.ca[''] = BaseConfigDerived()
+    opts.ca[''].hash_function = "sha256"
+    opts.ca[''].populate(confparser,'main')
+
+    ## Add additonal ca sections
+    sections = confparser.sections()
+    for a_section in sections:
+        if a_section.startswith('ca:'):
+            ca_name = a_section[3:]
+            opts.ca[ca_name] = BaseConfigDerived()
+            opts.ca[ca_name].hash_function = "sha256"
+            opts.ca[ca_name].populate(confparser,a_section)
+            opts.ca[ca_name].cakey = None
+            opts.ca[ca_name].cacert = None
+    

     return opts
     return opts