X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ipsilon%2Finstall%2Fipsilon-server-install;h=06251250d646f73fb0b3bd1ce8d0f5232e9a6bc2;hb=ce005b80365740bf2f274dc227a8498f33a7c184;hp=85f2ba32592f7f538442b95342a62394ea33d297;hpb=d6f7323943c0e7afc26f700d05831d294119a1d1;p=cascardo%2Fipsilon.git diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install index 85f2ba3..0625125 100755 --- a/ipsilon/install/ipsilon-server-install +++ b/ipsilon/install/ipsilon-server-install @@ -6,7 +6,7 @@ from ipsilon.info.common import InfoProviderInstall from ipsilon.providers.common import ProvidersInstall from ipsilon.helpers.common import EnvHelpersInstall from ipsilon.util.data import UserStore -from ipsilon.tools import files +from ipsilon.tools import files, dbupgrade import ConfigParser import argparse import cherrypy @@ -27,17 +27,14 @@ DATADIR = '/var/lib/ipsilon' HTTPDCONFD = '/etc/httpd/conf.d' BINDIR = '/usr/libexec' STATICDIR = '/usr/share/ipsilon' +CACHEDIR = '/var/cache/ipsilon' WSGI_SOCKET_PREFIX = None -class ConfigurationError(Exception): +class ConfigurationError(StandardError): def __init__(self, message): - super(ConfigurationError, self).__init__(message) - self.message = message - - def __str__(self): - return repr(self.message) + StandardError.__init__(self, message) #Silence cherrypy logging to screen @@ -102,12 +99,16 @@ def install(plugins, args): 'sysuser': args['system_user'], 'ipsilondir': BINDIR, 'staticdir': STATICDIR, + 'cachedir': CACHEDIR, 'admindb': args['admin_dburi'] or args['database_url'] % { 'datadir': args['data_dir'], 'dbname': 'adminconfig'}, 'usersdb': args['users_dburi'] or args['database_url'] % { '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 @@ -161,15 +162,18 @@ def install(plugins, args): 'info_provider': {}, 'auth_provider': {}} - # Move pre-existing admin db away + # Move pre-existing dbs away admin_db = cherrypy.config['admin.config.db'] if os.path.exists(admin_db): shutil.move(admin_db, '%s.backup.%s' % (admin_db, now)) - - # Rebuild user db users_db = cherrypy.config['user.prefs.db'] if os.path.exists(users_db): shutil.move(users_db, '%s.backup.%s' % (users_db, now)) + + # Initialize initial database schemas + dbupgrade.execute_upgrade(ipsilon_conf) + + # Store primary admin db = UserStore() db.save_user_preferences(args['admin_user'], {'is_admin': 1}) @@ -178,7 +182,8 @@ def install(plugins, args): plugin = plugins['Environment Helpers'][plugin_name] plugin_changes = {} if plugin.configure_server(args, plugin_changes) == False: - logger.info('Configuration of environment helper %s failed' % plugin_name) + msg = 'Configuration of environment helper %s failed' % plugin_name + raise ConfigurationError(msg) changes['env_helper'][plugin_name] = plugin_changes logger.info('Configuring login managers') @@ -189,7 +194,8 @@ def install(plugins, args): sys.exit('Login provider %s not installed' % plugin_name) plugin_changes = {} if plugin.configure(args, plugin_changes) == False: - logger.info('Configuration of login manager %s failed' % plugin_name) + msg = 'Configuration of login manager %s failed' % plugin_name + raise ConfigurationError(msg) changes['login_manager'][plugin_name] = plugin_changes logger.info('Configuring Info provider') @@ -197,7 +203,8 @@ def install(plugins, args): plugin = plugins['Info Provider'][plugin_name] plugin_changes = {} if plugin.configure(args, plugin_changes) == False: - logger.info('Configuration of info provider %s failed' % plugin_name) + msg = 'Configuration of info provider %s failed' % plugin_name + raise ConfigurationError(msg) changes['info_provider'][plugin_name] = plugin_changes logger.info('Configuring Authentication Providers') @@ -205,7 +212,8 @@ def install(plugins, args): plugin = plugins['Auth Providers'][plugin_name] plugin_changes = {} if plugin.configure(args, plugin_changes) == False: - logger.info('Configuration of auth provider %s failed' % plugin_name) + msg = 'Configuration of auth provider %s failed' % plugin_name + raise ConfigurationError(msg) changes['auth_provider'][plugin_name] = plugin_changes # Save any changes that were made @@ -214,6 +222,9 @@ def install(plugins, args): with open(install_changes, 'w+') as f: f.write(changes) + # Initialize extra database schemas + dbupgrade.execute_upgrade(ipsilon_conf) + # Fixup permissions so only the ipsilon user can read these files files.fix_user_dirs(instance_conf, opts['system_user']) files.fix_user_dirs(args['data_dir'], opts['system_user']) @@ -231,6 +242,10 @@ def uninstall(plugins, args): 'ipsilon-%s.conf' % args['instance']) data_dir = os.path.join(DATADIR, args['instance']) + tconf = ConfigParser.SafeConfigParser() + tconf.read(os.path.join(instance_conf, 'ipsilon.conf')) + cache_dir = tconf.get('global', 'cache_dir').replace('"', '') + if not os.path.exists(instance_conf): raise Exception('Could not find instance %s configuration' % args['instance']) @@ -283,6 +298,9 @@ def uninstall(plugins, args): shutil.rmtree(instance_conf) logger.info('Erasing instance data') shutil.rmtree(data_dir) + if cache_dir and os.path.exists(cache_dir): + for fn in os.listdir(cache_dir): + os.unlink(os.path.join(cache_dir, fn)) logger.info('Uninstalled instance %s' % args['instance']) @@ -310,7 +328,7 @@ def parse_config_profile(args): if g in globals(): globals()[g] = val else: - for k in globals().keys(): + for k in globals(): if k.lower() == g.lower(): globals()[k] = val break @@ -357,6 +375,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 = [] @@ -400,7 +420,7 @@ def parse_args(plugins): else: args['lm_order'] = args['lm_order'].split(',') - if len(args['lm_order']) == 0: + if len(args['lm_order']) == 0 and args['ipa'] != 'yes': sys.exit('No login plugins are enabled.') #FIXME: check instance is only alphanums @@ -429,7 +449,8 @@ if __name__ == '__main__': else: install(fplugins, opts) except Exception, e: # pylint: disable=broad-except - logger.exception(e) + logger.debug(e, exc_info=1) + if 'uninstall' in opts and opts['uninstall'] is True: logger.info('Uninstallation aborted.') else: