summaryrefslogtreecommitdiffstats
path: root/ipsilon/install
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2014-03-20 12:45:21 -0400
committerSimo Sorce <simo@redhat.com>2014-03-20 17:28:30 -0400
commit9d9679160296b2fe3103af20114484ee37dfdf44 (patch)
tree01ff7748faba9a2578b47892fdc1954d0aa1ed7d /ipsilon/install
parenta7b29aa585a5ec515514f88167688b0e6deb8f62 (diff)
downloadipsilon-9d9679160296b2fe3103af20114484ee37dfdf44.tar.gz
ipsilon-9d9679160296b2fe3103af20114484ee37dfdf44.tar.xz
ipsilon-9d9679160296b2fe3103af20114484ee37dfdf44.zip
Add Krb configuration code
Diffstat (limited to 'ipsilon/install')
-rwxr-xr-xipsilon/install/server.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipsilon/install/server.py b/ipsilon/install/server.py
index 28e5bdb..4c0aef7 100755
--- a/ipsilon/install/server.py
+++ b/ipsilon/install/server.py
@@ -79,15 +79,15 @@ def install(plugins, args):
logger.info('Installing default config files')
ipsilon_conf = os.path.join(CONFDIR, 'ipsilon.conf')
idp_conf = os.path.join(CONFDIR, 'idp.conf')
- httpd_conf = os.path.join(HTTPDCONFD, 'idp.conf')
+ args['httpd_conf'] = os.path.join(HTTPDCONFD, 'idp.conf')
if os.path.exists(ipsilon_conf):
shutil.move(ipsilon_conf, '%s.bakcup.%s' % (ipsilon_conf, now))
if os.path.exists(idp_conf):
shutil.move(idp_conf, '%s.backup.%s' % (idp_conf, now))
shutil.copy(os.path.join(TEMPLATES, 'ipsilon.conf'), CONFDIR)
shutil.copy(os.path.join(TEMPLATES, 'idp.conf'), CONFDIR)
- if not os.path.exists(httpd_conf):
- os.symlink(idp_conf, httpd_conf)
+ if not os.path.exists(args['httpd_conf']):
+ os.symlink(idp_conf, args['httpd_conf'])
# Load the cherrypy config from the newly installed file so
# that db paths and all is properly set before configuring
# components