Merge pull request #6059 from soltysh/bug1185031

Merged by openshift-bot
openshift · Jan 28, 2015 · 5d5cc95 · 5d5cc95
2 parents 779c223 + 296a44c
commit 5d5cc95
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/cartridges/openshift-origin-cartridge-postgresql/bin/control b/cartridges/openshift-origin-cartridge-postgresql/bin/control
@@ -48,7 +48,7 @@ function wait_for_postgres_availability {
 function start {
   if ! _is_running; then
     echo "Starting Postgres cartridge"
-    oo-erb conf/postgresql.conf.erb.hidden > data/postgresql.conf
+    oo-erb ${OPENSHIFT_POSTGRESQL_DIR}/conf/postgresql.conf.erb.hidden > data/postgresql.conf
 
     postgresql_context "nohup postgres |& /usr/bin/logshifter -tag postgresql &"
     wait_for_postgres_availability || error "Could not start Postgres" 70

diff --git a/cartridges/openshift-origin-cartridge-postgresql/versions/8.4/conf/postgresql.conf.erb b/cartridges/openshift-origin-cartridge-postgresql/versions/8.4/conf/postgresql.conf.erb
@@ -79,3 +79,9 @@ default_text_search_config = 'pg_catalog.english'
 # Logging
 
 log_line_prefix = '%t '
+
+<% if ENV['OPENSHIFT_POSTGRESQL_CONFIG'] %>
+<% ENV['OPENSHIFT_POSTGRESQL_CONFIG'].split(';').each do |elem| %>
+<%= elem %>
+<% end %>
+<% end %>
diff --git a/cartridges/openshift-origin-cartridge-postgresql/versions/9.2/conf/postgresql.conf.erb b/cartridges/openshift-origin-cartridge-postgresql/versions/9.2/conf/postgresql.conf.erb
@@ -85,3 +85,9 @@ default_text_search_config = 'pg_catalog.english'
 # Logging
 
 log_line_prefix = '%t '
+
+<% if ENV['OPENSHIFT_POSTGRESQL_CONFIG'] %>
+<% ENV['OPENSHIFT_POSTGRESQL_CONFIG'].split(';').each do |elem| %>
+<%= elem %>
+<% end %>
+<% end %>