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
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
'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})
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')
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')
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')
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
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'])
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
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