From 438dce6a6cb99eb3cc8028dff15cd02b6829e4b0 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 13 Feb 2015 14:12:55 -0500 Subject: [PATCH] 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 Reviewed-by: Simo Sorce --- ipsilon/install/ipsilon-server-install | 12 ++++++++---- 1 file 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']) -- 2.20.1