summaryrefslogtreecommitdiffstats
path: root/ipsilon/providers
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@redhat.com>2015-03-30 16:38:10 +0200
committerRob Crittenden <rcritten@redhat.com>2015-03-30 14:20:11 -0400
commit3fd51fe0d4593cdc39c28f11deafe27845f25584 (patch)
treeba17bf07693aa8fd3c09863ce21b2445f7e6400d /ipsilon/providers
parentdb41f6ea5ac2b4648350900791e32a83d0974e14 (diff)
downloadipsilon-3fd51fe0d4593cdc39c28f11deafe27845f25584.tar.gz
ipsilon-3fd51fe0d4593cdc39c28f11deafe27845f25584.tar.xz
ipsilon-3fd51fe0d4593cdc39c28f11deafe27845f25584.zip
Add options to explicitly set database uris during install
Also offer the option to set the OpenID database URI during install https://fedorahosted.org/ipsilon/ticket/17 Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com> Reviewed-by: Rob Crittenden <rcritten@redhat.com>
Diffstat (limited to 'ipsilon/providers')
-rw-r--r--ipsilon/providers/openidp.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/ipsilon/providers/openidp.py b/ipsilon/providers/openidp.py
index f79435f..4e47d3e 100644
--- 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