diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2015-04-21 09:34:41 -0400 |
|---|---|---|
| committer | Patrick Uiterwijk <puiterwijk@redhat.com> | 2015-05-12 00:39:06 +0200 |
| commit | 2858e7a24f9f071a20be00700dc9cec8931434a6 (patch) | |
| tree | fa27ce055cd65e4e7b8ef1dc07d9b59459f7a5d0 | |
| parent | 613e047c65aa78d661155a989149ad4745a8a25f (diff) | |
| download | ipsilon-2858e7a24f9f071a20be00700dc9cec8931434a6.tar.gz ipsilon-2858e7a24f9f071a20be00700dc9cec8931434a6.tar.xz ipsilon-2858e7a24f9f071a20be00700dc9cec8931434a6.zip | |
Configure the SAML2 session database during installation
https://fedorahosted.org/ipsilon/ticket/90
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
| -rwxr-xr-x | ipsilon/install/ipsilon-server-install | 5 | ||||
| -rw-r--r-- | templates/install/ipsilon.conf | 1 | ||||
| -rwxr-xr-x | tests/helpers/common.py | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install index 85f2ba3..5c1ef70 100755 --- a/ipsilon/install/ipsilon-server-install +++ b/ipsilon/install/ipsilon-server-install @@ -108,6 +108,9 @@ def install(plugins, args): 'datadir': args['data_dir'], 'dbname': 'userprefs'}, 'transdb': args['transaction_dburi'] or args['database_url'] % {'datadir': args['data_dir'], 'dbname': 'transactions'}, + 'samlsessionsdb': args['samlsessions_dburi'] or args[ + 'database_url'] % {'datadir': args['data_dir'], + 'dbname': 'saml2sessions'}, 'secure': "False" if args['secure'] == "no" else "True", 'debugging': "True" if args['server_debugging'] else "False"} # Testing database sessions @@ -357,6 +360,8 @@ def parse_args(plugins): 'template)') parser.add_argument('--transaction-dburi', help='Transaction database URI (override template)') + parser.add_argument('--samlsessions-dburi', + help='SAML 2 sessions database URI (override template)') lms = [] diff --git a/templates/install/ipsilon.conf b/templates/install/ipsilon.conf index b57aa55..c688f0b 100644 --- a/templates/install/ipsilon.conf +++ b/templates/install/ipsilon.conf @@ -10,6 +10,7 @@ base.dir = "${staticdir}" admin.config.db = "${admindb}" user.prefs.db = "${usersdb}" transactions.db = "${transdb}" +saml2.sessions.db = "${samlsessionsdb}" tools.sessions.on = True tools.sessions.name = "${instance}_ipsilon_session_id" diff --git a/tests/helpers/common.py b/tests/helpers/common.py index aa35d83..93d0f17 100755 --- a/tests/helpers/common.py +++ b/tests/helpers/common.py @@ -186,7 +186,8 @@ class IpsilonTestBase(object): env=env, preexec_fn=os.setsid) self.processes.append(p) p.wait() - for d in ['adminconfig', 'users', 'transactions', 'sessions']: + for d in ['adminconfig', 'users', 'transactions', 'sessions', + 'saml2sessions']: cmd = ['/usr/bin/createdb', '-h', addr, '-p', port, d] subprocess.check_call(cmd, env=env) |