Merge pull request #4 from cloudfoundry-community/custom_databases

Allowed users to add custom postgres databases.

Author: jhunt

ci/release_notes.md

@@ -0,0 +1,14 @@
+# New Features
+
+- Added the `pgpool.databases` property to auto create databases in postgres
+  Example:
+``` 
+    pgpool:  
+      databases:
+      - name: animals
+        users:
+        - porcupine
+        - hedgehog
+
+```
+

jobs/postgres/spec

@@ -89,3 +89,14 @@ properties:
   pgpool.users:
     description: "A list of {username: ..., password: ...} objects for defining pgpool users"
     default: []
+
+  pgpool.databases:
+    description: A list of databases to create in Postgres.
+    default: []
+    example: |
+      pgpool:
+        databases:
+          - name: animals
+            users:
+              - porcupine
+              - hedgehog

jobs/postgres/templates/bin/ctl

@@ -119,6 +119,22 @@ EOF
     echo
 
 <% end %>
+
+<% p('pgpool.databases', []).each do |database| %>
+    echo >>$LOG_DIR/$JOB_NAME.log "[postgres] setting up database <%= database['name'] %>"
+    set -x
+
+    createdb   -U vcap -p <%= port %>       -O vcap <%= database['name'] %> 
+
+    <% database['users'].each do |user| %>
+    psql -p <%= port %> -U vcap postgres -c "GRANT ALL PRIVILEGES ON DATABASE \"<%= database['name'] %>\" TO \"<%= user %>\""
+    <% end %>
+
+    set +x
+    echo
+
+<% end %>
+
 )>$LOG_DIR/user-creation.log 2>&1
     ;;
 

templates/jobs.yml

@@ -33,6 +33,11 @@ jobs:
           - host all all ::/0 md5
       pgpool:
         debug: true
+        databases:
+          - name: animals
+            users:
+              - porcupine
+              - hedgehog
         users:
           - username: porcupine
             password: quill