Commit 034b5ec7 authored by Marco Mariani's avatar Marco Mariani

don't do anything if data directory exists; fix ipv6 url

parent b8fe2e7c
...@@ -38,17 +38,18 @@ class Recipe(GenericBaseRecipe): ...@@ -38,17 +38,18 @@ class Recipe(GenericBaseRecipe):
def _options(self, options): def _options(self, options):
options['password'] = self.generatePassword() options['password'] = self.generatePassword()
options['url'] = 'postgresql://%(user)s:%(password)s/%(host)s:%(port)s/%(dbname)s' % dict(options, host=options['ipv6_host'].pop()) options['url'] = 'postgresql://%(user)s:%(password)s/[%(host)s]:%(port)s/%(dbname)s' % dict(options, host=options['ipv6_host'].pop())
def install(self): def install(self):
pgdata = self.options['pgdata-directory']
if not os.path.exists(pgdata):
self.createCluster() self.createCluster()
self.createConfig() self.createConfig()
self.createDatabase() self.createDatabase()
self.createRunScript() self.createRunScript()
pgdata = self.options['pgdata-directory']
return [ return [
os.path.join(pgdata, 'postgresql.conf') os.path.join(pgdata, 'postgresql.conf')
] ]
...@@ -57,10 +58,8 @@ class Recipe(GenericBaseRecipe): ...@@ -57,10 +58,8 @@ class Recipe(GenericBaseRecipe):
def createCluster(self): def createCluster(self):
initdb_binary = os.path.join(self.options['bin'], 'initdb') initdb_binary = os.path.join(self.options['bin'], 'initdb')
pgdata = self.options['pgdata-directory'] pgdata = self.options['pgdata-directory']
if not os.path.exists(pgdata):
try: try:
subprocess.check_call([initdb_binary, subprocess.check_call([initdb_binary,
'-D', pgdata, '-D', pgdata,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment