default postgres.config.port to 6432

Author: drnic

jobs/postgres/spec

@@ -33,7 +33,8 @@ consumes:
 properties:
   postgres.config:
     description: A map of postgresql.conf configuration directives, keyed by name.
-    default: {}
+    default:
+      port: 6432
 
   postgres.hba:
     description: A list of pg_hba.conf configuration acls.  See Section 19.1 of the PostgreSQL manual.

jobs/postgres/templates/bin/ctl

@@ -4,7 +4,7 @@
 masterip    = link("db").instances.first.address
 replication = p('postgres.replication.enabled', false) && masterip != ''
 master      = replication && spec.index == 0
-port        = p('postgres.config.port')
+port        = p('postgres.config')["port"] || 6432
 
 %>
 # first, some diagnostic info
@@ -107,8 +107,8 @@ EOF
 <% p('pgpool.users', []).each do |user| %>
     echo >>$LOG_DIR/$JOB_NAME.log "[postgres] setting up user <%= user['username'] %>"
     echo "[$(date)] setting up user <%= user['username'] %>"
-    <% admin = '-DRS' %> 
-    <% admin = '-drs' if user["admin"] %>     
+    <% admin = '-DRS' %>
+    <% admin = '-drs' if user["admin"] %>
     set -x
 
     createuser -U vcap -p <%= port %> <%=admin %> -El <%= user['username'] %>