Browse files

Adjusted to use json_uri not json_file.

  • Loading branch information...
1 parent 44d56ca commit d9d428b3fb74ab7e33c271be3e95858603e2eb7d @wayneeseguin wayneeseguin committed Mar 4, 2012
Showing with 3 additions and 7 deletions.
  1. +1 −1 postgresql/shell/functions
  2. +2 −6 postgresql/shell/initialize
View
2 postgresql/shell/functions
@@ -85,7 +85,7 @@ postgresql_defaults()
config read file "defaults" key "version" prefix "package" from "postgresql"
service_data_path="/var/db/postgresql/${package_version}/data"
- json get from ${json_file} \
+ json get from ${json_uri} \
into "postgresql_defaults" \
string "postgresql/version" default "${package_version}" as "version" \
string "postgresql/bind" default 0.0.0.0 as "bind" \
View
8 postgresql/shell/initialize
@@ -5,12 +5,8 @@ typeset -g json_file file service_user service_data_path master replica port \
typeset -ga _initdb_flags configure_flags >/dev/null 2>&1 # Don't care if declared already.
typeset -gx PGDATA
-if file exists "/etc/system.json"
-then
- json_file="/etc/system.json"
-else
- json_file="${extension_path}/config/defaults.json"
-fi
+if variable is empty json_uri
+then json_uri="${extension_path}/config/defaults.json" ; fi
postgresql_defaults

0 comments on commit d9d428b

Please sign in to comment.