diff options
| author | Simo Sorce <simo@redhat.com> | 2014-06-06 16:04:15 -0400 |
|---|---|---|
| committer | Simo Sorce <simo@redhat.com> | 2014-06-06 16:05:06 -0400 |
| commit | f9abb07cc479008c6ee7f72e0c911768c7c9bd82 (patch) | |
| tree | 005c9628e4ad8a4afb076217fa21361320b3836f | |
| parent | 11e7cc116c1d9b0f7fcd1d3d24d402b3590b8375 (diff) | |
| download | ipsilon-f9abb07cc479008c6ee7f72e0c911768c7c9bd82.tar.gz ipsilon-f9abb07cc479008c6ee7f72e0c911768c7c9bd82.tar.xz ipsilon-f9abb07cc479008c6ee7f72e0c911768c7c9bd82.zip | |
Add server install option to turn on debugging
Use this in the testsuite so we can get meaningful output in the logs
when something fails.
Signed-off-by: Simo Sorce <simo@redhat.com>
| -rwxr-xr-x | ipsilon/install/ipsilon-server-install | 5 | ||||
| -rw-r--r-- | templates/install/ipsilon.conf | 4 | ||||
| -rw-r--r-- | tests/test1.cfg | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install index 1bf0072..1ffd594 100755 --- a/ipsilon/install/ipsilon-server-install +++ b/ipsilon/install/ipsilon-server-install @@ -102,7 +102,8 @@ def install(plugins, args): 'datadir': args['data_dir'], 'sysuser': args['system_user'], 'ipsilondir': BINDIR, - 'staticdir': STATICDIR} + 'staticdir': STATICDIR, + 'debugging': "True" if args['server_debugging'] else "False"} if WSGI_SOCKET_PREFIX: confopts['wsgi_socket'] = 'WSGISocketPrefix %s' % WSGI_SOCKET_PREFIX files.write_from_template(ipsilon_conf, @@ -216,6 +217,8 @@ def parse_args(plugins): help="User account that is assigned admin privileges") parser.add_argument('--config-profile', default=None, help="File containing install options") + parser.add_argument('--server-debugging', action='store_true', + help="Uninstall the server and all data") parser.add_argument('--uninstall', action='store_true', help="Uninstall the server and all data") diff --git a/templates/install/ipsilon.conf b/templates/install/ipsilon.conf index 89e14f1..357a3a7 100644 --- a/templates/install/ipsilon.conf +++ b/templates/install/ipsilon.conf @@ -1,7 +1,7 @@ [global] -debug = False +debug = ${debugging} -log.screen = False +log.screen = ${debugging} base.mount = "/${instance}" base.dir = "${staticdir}" admin.config.db = "${datadir}/adminconfig.sqlite" diff --git a/tests/test1.cfg b/tests/test1.cfg index 81ae254..bd592a2 100644 --- a/tests/test1.cfg +++ b/tests/test1.cfg @@ -21,6 +21,7 @@ testauth=yes pam=no krb=no ipa=no +server_debugging=True [sp1_globals] HTTPDCONFD=${TESTDIR}/sp1/conf.d |