Add options to explicitly set database uris during install

[cascardo/ipsilon.git] / ipsilon / providers / openidp.py

diff --git a/ipsilon/providers/openidp.py b/ipsilon/providers/openidp.py
index f79435f..4e47d3e 100644 (file)
--- a/ipsilon/providers/openidp.py
+++ b/ipsilon/providers/openidp.py
@@ -141,6 +141,8 @@ class Installer(ProviderInstaller):
     def install_args(self, group):
         group.add_argument('--openid', choices=['yes', 'no'], default='yes',
                            help='Configure OpenID Provider')
+        group.add_argument('--openid-dburi',
+                           help='OpenID database URI')
 
     def configure(self, opts):
         if opts['openid'] != 'yes':
@@ -158,7 +160,10 @@ class Installer(ProviderInstaller):
         po.wipe_data()
         po.wipe_config_values()
         config = {'endpoint url': url,
-                  'identity_url_template': '%sid/%%(username)s' % url}
+                  'identity_url_template': '%sid/%%(username)s' % url,
+                  'database url': opts['openid_dburi'] or
+                  opts['database_url'] % {
+                      'datadir': opts['data_dir'], 'dbname': 'openid'}}
         po.save_plugin_config(config)
 
         # Update global config to add login plugin