Commit 5af19d91 authored by Marco Mariani's avatar Marco Mariani

changed key order

parent 2f8fa1f9
...@@ -171,19 +171,19 @@ crl = $${directory:ca-dir}/crl/ ...@@ -171,19 +171,19 @@ crl = $${directory:ca-dir}/crl/
[postgres-instance] [postgres-instance]
recipe = slapos.cookbook:postgres recipe = slapos.cookbook:postgres
ipv6_host = $${slap-network-information:global-ipv6} bin = $${rootdirectory:bin}
services = $${basedirectory:services}
user = postgres user = postgres
port = 5432 port = 5432
dbname = db dbname = db
ipv6_host = $${slap-network-information:global-ipv6}
# XXX the next line is required by stunnel, not by us # XXX the next line is required by stunnel, not by us
ipv4_host = $${slap-network-information:local-ipv4} ipv4_host = $${slap-network-information:local-ipv4}
# pgdata_directory is created by initdb, and should not exist beforehand. # pgdata_directory is created by initdb, and should not exist beforehand.
pgdata-directory = $${rootdirectory:var}/data pgdata-directory = $${rootdirectory:var}/data
backup-directory = $${basedirectory:backup}/postgres backup-directory = $${basedirectory:backup}/postgres
services = $${basedirectory:services}
bin = $${rootdirectory:bin}
dependency-symlinks = $${symlinks:recipe} dependency-symlinks = $${symlinks:recipe}
[ca-stunnel] [ca-stunnel]
<= certificate-authority <= certificate-authority
recipe = slapos.cookbook:certificate_authority.request recipe = slapos.cookbook:certificate_authority.request
......
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