HTTPDCONFD = '/etc/httpd/conf.d'
BINDIR = '/usr/libexec'
STATICDIR = '/usr/share/ipsilon'
-CACHEDIR = '/var/cache/httpd/ipsilon'
+CACHEDIR = '/var/cache/ipsilon'
WSGI_SOCKET_PREFIX = None
'publicdatadir': args['public_data_dir'],
'wellknowndir': args['wellknown_dir'],
'sysuser': args['system_user'],
+ 'cleanup_interval': args['cleanup_interval'],
'ipsilondir': BINDIR,
'staticdir': STATICDIR,
'cachedir': CACHEDIR,
'ipsilon-%s.conf' % args['instance'])
data_dir = os.path.join(DATADIR, args['instance'])
+ try:
+ tconf = ConfigParser.SafeConfigParser()
+ tconf.read(os.path.join(instance_conf, 'ipsilon.conf'))
+ cache_dir = tconf.get('global', 'cache_dir')
+ except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+ cache_dir = None
+ else:
+ cache_dir = cache_dir.replace('"', '')
+
if not os.path.exists(instance_conf):
raise Exception('Could not find instance %s configuration'
% args['instance'])
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'])
parser.add_argument('--transaction-dburi',
help='Transaction database URI (override template)')
parser.add_argument('--samlsessions-dburi',
- help='SAML 2 sessions database URI (override template)')
+ help='SAML 2 sessions database URI (override ' +
+ 'template)')
+ parser.add_argument('--cleanup-interval', default=30,
+ help='Interval between cleaning up stale database ' +
+ 'entries (in minutes, default: 30 minutes)')
lms = []
opts = []
out = 0
openlogs()
+ logger.setLevel(logging.DEBUG)
+
try:
fplugins = find_plugins()
opts = parse_args(fplugins)
- logger.setLevel(logging.DEBUG)
-
logger.debug('Installation arguments:')
for k in sorted(opts.iterkeys()):
logger.debug('%s: %s', k, opts[k])
else:
install(fplugins, opts)
except Exception, e: # pylint: disable=broad-except
- logger.debug(e, exc_info=1)
+ logger.info(str(e)) # emit message to console
+ logger.debug(e, exc_info=1) # add backtrace information to logfile
if 'uninstall' in opts and opts['uninstall'] is True:
logger.info('Uninstallation aborted.')