From b9022e96e1353dab0843e6341239469dec773b1f Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Tue, 18 Jun 2013 20:52:31 +0200
Subject: Opitons: add cook function to parse a dict for the config file

---
 src/lib/Bcfg2/Options.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index 243c4ed2a..f027268e1 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -319,6 +319,28 @@ def colon_split(c_string):
     return []
 
 
+def dict_split(c_string):
+    """ split an option string on commans, optionally sourrunded by
+    whitespace and split the resulting items again on equals signs,
+    returning a dict """
+    result = dict()
+    if c_string:
+        items = re.split(r'\s*,\s*', c_string)
+        for item in items:
+            if r'=' in item:
+                key, value = item.split(r'=', 1)
+                try:
+                    result[key] = get_bool(value)
+                except ValueError:
+                    try:
+                        result[key] = get_int(value)
+                    except ValueError:
+                        result[key] = value
+            else:
+                result[item] = True
+    return result
+
+
 def get_bool(val):
     """ given a string value of a boolean configuration option, return
     an actual bool (True or False) """
-- 
cgit v1.2.3-1-g7c22


From 58f4b311bfa9f192c9d4d4a418e9f0db5bce1897 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Tue, 18 Jun 2013 20:53:05 +0200
Subject: Options: add database.options

With the options setting in the database section of the config file
various database options for the django database could be set (like
ssl mode for postgres). For more information, consult your django
databse backend module's documentation.
---
 src/lib/Bcfg2/Options.py  | 7 +++++++
 src/lib/Bcfg2/settings.py | 9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index f027268e1..84551a02d 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -674,6 +674,12 @@ DB_PORT = \
            cf=('database', 'port'),
            deprecated_cf=('statistics', 'database_port'))
 
+DB_OPTIONS = \
+    Option('Database options',
+           default=dict(),
+           cf=('database', 'options'),
+           cook=dict_split)
+
 # Django options
 WEB_CFILE = \
     Option('Web interface configuration file',
@@ -1307,6 +1313,7 @@ DATABASE_COMMON_OPTIONS = dict(web_configfile=WEB_CFILE,
                                db_password=DB_PASSWORD,
                                db_host=DB_HOST,
                                db_port=DB_PORT,
+                               db_options=DB_OPTIONS,
                                time_zone=DJANGO_TIME_ZONE,
                                django_debug=DJANGO_DEBUG,
                                web_prefix=DJANGO_WEB_PREFIX)
diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py
index 9adfd66bf..6e718a079 100644
--- a/src/lib/Bcfg2/settings.py
+++ b/src/lib/Bcfg2/settings.py
@@ -26,6 +26,7 @@ DATABASE_USER = None
 DATABASE_PASSWORD = None
 DATABASE_HOST = None
 DATABASE_PORT = None
+DATABASE_OPTIONS = None
 
 TIME_ZONE = None
 
@@ -58,8 +59,8 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None, quiet=False):
     """ read the config file and set django settings based on it """
     # pylint: disable=W0602,W0603
     global DATABASE_ENGINE, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, \
-        DATABASE_HOST, DATABASE_PORT, DEBUG, TEMPLATE_DEBUG, TIME_ZONE, \
-        MEDIA_URL
+        DATABASE_HOST, DATABASE_PORT, DATABASE_OPTIONS, DEBUG, \
+        TEMPLATE_DEBUG, TIME_ZONE, MEDIA_URL
     # pylint: enable=W0602,W0603
 
     if not os.path.exists(cfile) and os.path.exists(DEFAULT_CONFIG):
@@ -86,7 +87,8 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None, quiet=False):
              USER=setup['db_user'],
              PASSWORD=setup['db_password'],
              HOST=setup['db_host'],
-             PORT=setup['db_port'])
+             PORT=setup['db_port'],
+             OPTIONS=setup['db_options'])
 
     if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] < 2:
         DATABASE_ENGINE = setup['db_engine']
@@ -95,6 +97,7 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None, quiet=False):
         DATABASE_PASSWORD = DATABASES['default']['PASSWORD']
         DATABASE_HOST = DATABASES['default']['HOST']
         DATABASE_PORT = DATABASES['default']['PORT']
+        DATABASE_OPTIONS = DATABASES['default']['OPTIONS']
 
     # dropping the version check.  This was added in 1.1.2
     TIME_ZONE = setup['time_zone']
-- 
cgit v1.2.3-1-g7c22