Permalink
Browse files

Configure CA path in web/ during nimbus-configure

  • Loading branch information...
1 parent 2ee52af commit 00f68d13661cd68c38d88b16838401bc7b5b65e2 @labisso labisso committed Feb 25, 2010
Showing with 6 additions and 9 deletions.
  1. +6 −9 home/sbin/setup.py
View
@@ -21,7 +21,7 @@
# relative to base directory
hostcert: var/hostcert.pem
hostkey: var/hostkey.pem
-CA.dir: var/ca
+ca.dir: var/ca
gridmap: services/etc/nimbus/nimbus-grid-mapfile
@@ -225,7 +225,7 @@ def gtdir_path(self):
return self.resolve_path('services/')
def cadir_path(self):
- path = self.get_config('CA.dir')
+ path = self.get_config('ca.dir')
return self.resolve_path(path or 'var/ca/')
def hostcert_path(self):
@@ -291,17 +291,14 @@ def perform_setup(self):
if not webconf.read(webconfpath):
raise IncompatibleEnvironment(
"nimbus web config does not exist: %s" % webconfpath)
- webconf.set('nimbusweb', 'ssl.cert', hostcert)
- webconf.set('nimbusweb', 'ssl.key', hostkey)
+ relpath = pathutil.relpath
+ webconf.set('nimbusweb', 'ssl.cert', relpath(hostcert, webdir))
+ webconf.set('nimbusweb', 'ssl.key', relpath(hostkey, webdir))
+ webconf.set('nimbusweb', 'ca.dir', relpath(cadir, webdir))
with open(webconfpath, 'wb') as webconffile:
webconf.write(webconffile)
- if not os.path.exists(gridmap):
- example_gridmap = self.resolve_path('var/gridmap.example')
- import shutil
- shutil.copyfile(example_gridmap, gridmap)
-
# then setup GT container
gtcontainer.adjust_hostname(hostname, webdir, gtdir, log)
gtcontainer.adjust_secdesc_path(webdir, gtdir, log)

0 comments on commit 00f68d1

Please sign in to comment.