summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2015-02-13 14:12:55 -0500
committerRob Crittenden <rcritten@redhat.com>2015-02-13 16:47:12 -0500
commitb88a93339d2f78e7cb2715ff7b85b6856881759c (patch)
tree9e77a89b31547dc8c55fb052b498256148b2e742
parentcd75261036a3380e7adcc90f9552e82c57e931e0 (diff)
downloadipsilon.git-b88a93339d2f78e7cb2715ff7b85b6856881759c.tar.gz
ipsilon.git-b88a93339d2f78e7cb2715ff7b85b6856881759c.tar.xz
ipsilon.git-b88a93339d2f78e7cb2715ff7b85b6856881759c.zip
Let the plugin configure calls notice failures.
The call to configure the info/login/auth/provider plugins had no way of recognizing that the configuration failed. Have it check for an explicit False return value as an indication of failure. This lets the configuration plugin do a simple return (None) if it isn't enabled. Signed-off-by: Rob Crittenden <rcritten@redhat.com>
-rwxr-xr-xipsilon/install/ipsilon-server-install12
1 files changed, 8 insertions, 4 deletions
diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install
index 8728490..dfd2ffe 100755
--- a/ipsilon/install/ipsilon-server-install
+++ b/ipsilon/install/ipsilon-server-install
@@ -177,22 +177,26 @@ def install(plugins, args):
logger.info('Configuring environment helpers')
for plugin_name in plugins['Environment Helpers']:
plugin = plugins['Environment Helpers'][plugin_name]
- plugin.configure_server(args)
+ if plugin.configure_server(args) == False:
+ print 'Configuration of environment helper %s failed' % plugin_name
logger.info('Configuring login managers')
for plugin_name in args['lm_order']:
plugin = plugins['Login Managers'][plugin_name]
- plugin.configure(args)
+ if plugin.configure(args) == False:
+ print 'Configuration of login manager %s failed' % plugin_name
logger.info('Configuring Info provider')
for plugin_name in plugins['Info Provider']:
plugin = plugins['Info Provider'][plugin_name]
- plugin.configure(args)
+ if plugin.configure(args) == False:
+ print 'Configuration of info provider %s failed' % plugin_name
logger.info('Configuring Authentication Providers')
for plugin_name in plugins['Auth Providers']:
plugin = plugins['Auth Providers'][plugin_name]
- plugin.configure(args)
+ if plugin.configure(args) == False:
+ print 'Configuration of auth provider %s failed' % plugin_name
# Fixup permissions so only the ipsilon user can read these files
files.fix_user_dirs(instance_conf, opts['system_user'])