X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Finstall%2Fipsilon-server-install;h=0677f0edc5bab5d6b8f59467a819a6ddb571d5ac;hp=502d4ebe86a64658909d66677335ec5523564608;hb=485baf6ee7a315d1af1086fe5b5da8cff6c4ba37;hpb=f73332fb7d55bd5753a8bafc2493172203fcf377 diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install index 502d4eb..0677f0e 100755 --- a/ipsilon/install/ipsilon-server-install +++ b/ipsilon/install/ipsilon-server-install @@ -1,21 +1,5 @@ #!/usr/bin/python -# -# Copyright (C) 2014 Simo Sorce -# -# see file 'COPYING' for use and warranty information -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING from ipsilon.login.common import LoginMgrsInstall from ipsilon.info.common import InfoProviderInstall @@ -26,6 +10,7 @@ from ipsilon.tools import files import ConfigParser import argparse import cherrypy +import json import logging import os import pwd @@ -40,7 +25,7 @@ TEMPLATES = '/usr/share/ipsilon/templates/install' CONFDIR = '/etc/ipsilon' DATADIR = '/var/lib/ipsilon' HTTPDCONFD = '/etc/httpd/conf.d' -BINDIR = '/usr/sbin' +BINDIR = '/usr/libexec' STATICDIR = '/usr/share/ipsilon' WSGI_SOCKET_PREFIX = None @@ -79,7 +64,15 @@ def openlogs(): lh = logging.StreamHandler(sys.stderr) formatter = logging.Formatter('[%(asctime)s] %(message)s') lh.setFormatter(formatter) + lh.setLevel(logging.DEBUG) logger.addHandler(lh) + logger.propagate = False + ch = logging.StreamHandler(sys.stdout) + formatter = logging.Formatter('%(message)s') + ch.setFormatter(formatter) + ch.setLevel(logging.INFO) + logger.addHandler(ch) + cherrypy.log.error_log.setLevel(logging.DEBUG) def install(plugins, args): @@ -162,6 +155,12 @@ def install(plugins, args): # components cherrypy.config.update(ipsilon_conf) + # Prepare to allow plugins to save things changed during install + changes = {'env_helper': {}, + 'login_manager': {}, + 'info_provider': {}, + 'auth_provider': {}} + # Move pre-existing admin db away admin_db = cherrypy.config['admin.config.db'] if os.path.exists(admin_db): @@ -177,8 +176,10 @@ def install(plugins, args): logger.info('Configuring environment helpers') for plugin_name in plugins['Environment Helpers']: plugin = plugins['Environment Helpers'][plugin_name] - if plugin.configure_server(args) == False: - print 'Configuration of environment helper %s failed' % plugin_name + plugin_changes = {} + if plugin.configure_server(args, plugin_changes) == False: + logger.info('Configuration of environment helper %s failed' % plugin_name) + changes['env_helper'][plugin_name] = plugin_changes logger.info('Configuring login managers') for plugin_name in args['lm_order']: @@ -186,20 +187,32 @@ def install(plugins, args): plugin = plugins['Login Managers'][plugin_name] except KeyError: sys.exit('Login provider %s not installed' % plugin_name) - if plugin.configure(args) == False: - print 'Configuration of login manager %s failed' % plugin_name + plugin_changes = {} + if plugin.configure(args, plugin_changes) == False: + logger.info('Configuration of login manager %s failed' % plugin_name) + changes['login_manager'][plugin_name] = plugin_changes logger.info('Configuring Info provider') for plugin_name in plugins['Info Provider']: plugin = plugins['Info Provider'][plugin_name] - if plugin.configure(args) == False: - print 'Configuration of info provider %s failed' % plugin_name + plugin_changes = {} + if plugin.configure(args, plugin_changes) == False: + logger.info('Configuration of info provider %s failed' % plugin_name) + changes['info_provider'][plugin_name] = plugin_changes logger.info('Configuring Authentication Providers') for plugin_name in plugins['Auth Providers']: plugin = plugins['Auth Providers'][plugin_name] - if plugin.configure(args) == False: - print 'Configuration of auth provider %s failed' % plugin_name + plugin_changes = {} + if plugin.configure(args, plugin_changes) == False: + logger.info('Configuration of auth provider %s failed' % plugin_name) + changes['auth_provider'][plugin_name] = plugin_changes + + # Save any changes that were made + install_changes = os.path.join(instance_conf, 'install_changes') + changes = json.dumps(changes) + with open(install_changes, 'w+') as f: + f.write(changes) # Fixup permissions so only the ipsilon user can read these files files.fix_user_dirs(instance_conf, opts['system_user']) @@ -231,29 +244,38 @@ def uninstall(plugins, args): if sure != 'yes': raise Exception('Aborting') + # Get the details of what we changed during installation + install_changes = os.path.join(instance_conf, 'install_changes') + with open(install_changes, 'r') as f: + changes = json.loads(f.read()) + logger.info('Removing environment helpers') for plugin_name in plugins['Environment Helpers']: plugin = plugins['Environment Helpers'][plugin_name] - if plugin.unconfigure(args) == False: - print 'Removal of environment helper %s failed' % plugin_name + plugin_changes = changes['env_helper'][plugin_name] + if plugin.unconfigure(args, plugin_changes) == False: + logger.info('Removal of environment helper %s failed' % plugin_name) logger.info('Removing login managers') for plugin_name in plugins['Login Managers']: plugin = plugins['Login Managers'][plugin_name] - if plugin.unconfigure(args) == False: - print 'Removal of login manager %s failed' % plugin_name + plugin_changes = changes['login_manager'][plugin_name] + if plugin.unconfigure(args, plugin_changes) == False: + logger.info('Removal of login manager %s failed' % plugin_name) logger.info('Removing Info providers') for plugin_name in plugins['Info Provider']: plugin = plugins['Info Provider'][plugin_name] - if plugin.unconfigure(args) == False: - print 'Removal of info provider %s failed' % plugin_name + plugin_changes = changes['info_provider'][plugin_name] + if plugin.unconfigure(args, plugin_changes) == False: + logger.info('Removal of info provider %s failed' % plugin_name) logger.info('Removing Authentication Providers') for plugin_name in plugins['Auth Providers']: plugin = plugins['Auth Providers'][plugin_name] - if plugin.unconfigure(args) == False: - print 'Removal of auth provider %s failed' % plugin_name + plugin_changes = changes['auth_provider'][plugin_name] + if plugin.unconfigure(args, plugin_changes) == False: + logger.info('Removal of auth provider %s failed' % plugin_name) logger.info('Removing httpd configuration') os.remove(httpd_conf) @@ -395,13 +417,13 @@ if __name__ == '__main__': logger.setLevel(logging.DEBUG) - logger.info('Intallation arguments:') + logger.debug('Installation arguments:') for k in sorted(opts.iterkeys()): - logger.info('%s: %s', k, opts[k]) + logger.debug('%s: %s', k, opts[k]) if 'uninstall' in opts and opts['uninstall'] is True: if not os.path.exists(os.path.join(CONFDIR, opts['instance'])): - print 'Instance %s could not be found' % opts['instance'] + logger.info('Instance %s could not be found' % opts['instance']) sys.exit(0) uninstall(fplugins, opts) else: @@ -409,10 +431,10 @@ if __name__ == '__main__': except Exception, e: # pylint: disable=broad-except logger.exception(e) if 'uninstall' in opts and opts['uninstall'] is True: - print 'Uninstallation aborted.' + logger.info('Uninstallation aborted.') else: - print 'Installation aborted.' - print 'See log file %s for details' % LOGFILE + logger.info('Installation aborted.') + logger.info('See log file %s for details' % LOGFILE) out = 1 except SystemExit: out = 1 @@ -420,8 +442,8 @@ if __name__ == '__main__': finally: if out == 0: if 'uninstall' in opts and opts['uninstall'] is True: - print 'Uninstallation complete.' + logger.info('Uninstallation complete.') else: - print 'Installation complete.' - print 'Please restart HTTPD to enable the IdP instance.' + logger.info('Installation complete.') + logger.info('Please restart HTTPD to enable the IdP instance.') sys.exit(out)