7 files changed, 67 insertions, 40 deletions
diff --git a/sca-cpp/trunk/components/cache/memcached-start b/sca-cpp/trunk/components/cache/memcached-start
index 5a71e7189f..ca6c4ac721 100755
--- a/sca-cpp/trunk/components/cache/memcached-start
+++ b/sca-cpp/trunk/components/cache/memcached-start
@@ -23,10 +23,10 @@ root=`echo "import os; print os.path.realpath('$1')" | python`
 
 addr=$2
 if [ "$addr" = "" ]; then
-    ip=""
+    host=""
     port="11211"
 else
-    ip=`$here/../../modules/http/httpd-addr ip $addr`
+    host=`$here/../../modules/http/httpd-addr ip $addr`
     port=`$here/../../modules/http/httpd-addr port $addr`
 fi
 
@@ -43,9 +43,9 @@ fi
 mkdir -p $root/memcached
 echo $log > $root/memcached/logger
 
-if [ "$ip" = "" ]; then
+if [ "$host" = "" ]; then
     nohup /bin/sh -c "($memcached_prefix/bin/memcached -d -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)" 1>/dev/null 2>/dev/null &
 else
-    nohup /bin/sh -c "($memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)" 1>/dev/null 2>/dev/null &
+    nohup /bin/sh -c "($memcached_prefix/bin/memcached -d -l $host -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)" 1>/dev/null 2>/dev/null &
 fi
 
diff --git a/sca-cpp/trunk/components/cache/memcached-stop b/sca-cpp/trunk/components/cache/memcached-stop
index 50d094b9c7..a36c03c06a 100755
--- a/sca-cpp/trunk/components/cache/memcached-stop
+++ b/sca-cpp/trunk/components/cache/memcached-stop
@@ -23,18 +23,18 @@ root=`echo "import os; print os.path.realpath('$1')" | python`
 
 addr=$2
 if [ "$addr" = "" ]; then
-    ip=""
+    host=""
     port="11211"
 else
-    ip=`$here/../../modules/http/httpd-addr ip $addr`
+    host=`$here/../../modules/http/httpd-addr ip $addr`
     port=`$here/../../modules/http/httpd-addr port $addr`
 fi
 
 memcached_prefix=`cat $here/memcached.prefix`
-if [ "$ip" = "" ]; then
+if [ "$host" = "" ]; then
     mc="$memcached_prefix/bin/memcached -d -m 4 -p $port"
 else
-    mc="$memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port"
+    mc="$memcached_prefix/bin/memcached -d -l $host -m 4 -p $port"
 fi
 
 k=`ps -ef | grep -v grep | grep "${mc}" | awk '{ print $2 }'`
diff --git a/sca-cpp/trunk/components/log/scribed-central-conf b/sca-cpp/trunk/components/log/scribed-central-conf
index 066dad4add..3c62107da5 100755
--- a/sca-cpp/trunk/components/log/scribed-central-conf
+++ b/sca-cpp/trunk/components/log/scribed-central-conf
@@ -22,9 +22,9 @@ here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $h
 mkdir -p $1
 root=`echo "import os; print os.path.realpath('$1')" | python`
 
-port=$2
-if [ "$port" = "" ]; then
-    port="1463"
+host=$2
+if [ "$host" = "" ]; then
+    host="*"
 fi
 
 mkdir -p $root/scribe/conf
@@ -34,7 +34,8 @@ mkdir -p $root/scribe/logs/central-secondary
 cat >$root/scribe/conf/scribe-central.conf <<EOF
 # Generated by: scribed-central-conf $*
 # Scribe central configuration
-port=$port
+host=$host
+port=1463
 max_msg_per_second=2000000
 check_interval=3
 
diff --git a/sca-cpp/trunk/components/log/scribed-central-firehose-conf b/sca-cpp/trunk/components/log/scribed-central-firehose-conf
index 660cf7820a..f76aed58c9 100755
--- a/sca-cpp/trunk/components/log/scribed-central-firehose-conf
+++ b/sca-cpp/trunk/components/log/scribed-central-firehose-conf
@@ -22,9 +22,9 @@ here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $h
 mkdir -p $1
 root=`echo "import os; print os.path.realpath('$1')" | python`
 
-port=$2
-if [ "$port" = "" ]; then
-    port="1463"
+host=$2
+if [ "$host" = "" ]; then
+    host="*"
 fi
 
 mkdir -p $root/scribe/conf
@@ -36,7 +36,8 @@ mkdir -p $root/scribe/logs/firehose-secondary
 cat >$root/scribe/conf/scribe-central.conf <<EOF
 # Generated by: scribed-central-conf $*
 # Scribe central configuration
-port=$port
+host=$host
+port=1463
 max_msg_per_second=2000000
 check_interval=3
 
diff --git a/sca-cpp/trunk/components/log/scribed-client-conf b/sca-cpp/trunk/components/log/scribed-client-conf
index 8395b3f96e..e0a35581c7 100755
--- a/sca-cpp/trunk/components/log/scribed-client-conf
+++ b/sca-cpp/trunk/components/log/scribed-client-conf
@@ -22,10 +22,12 @@ here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $h
 mkdir -p $1
 root=`echo "import os; print os.path.realpath('$1')" | python`
 
-central=$2
-cport=$3
-if [ "$cport" = "" ]; then
-    cport="1463"
+if [ "$3" = "" ]; then
+    host="*"
+    central=$2
+else
+    host=$2
+    central=$3
 fi
 
 mkdir -p $root/scribe/conf
@@ -34,6 +36,7 @@ mkdir -p $root/scribe/logs/client-secondary
 cat >$root/scribe/conf/scribe-client.conf <<EOF
 # Generated by: scribed-client-conf $*
 # Scribe client configuration
+host=$host
 port=1464
 max_msg_per_second=2000000
 check_interval=3
@@ -53,7 +56,7 @@ retry_interval_range=10
 <primary>
 type=network
 remote_host=$central
-remote_port=$cport
+remote_port=1463
 </primary>
 
 <secondary>
diff --git a/sca-cpp/trunk/components/sqldb/pgsql-conf b/sca-cpp/trunk/components/sqldb/pgsql-conf
index 482048a295..8adbb902c9 100755
--- a/sca-cpp/trunk/components/sqldb/pgsql-conf
+++ b/sca-cpp/trunk/components/sqldb/pgsql-conf
@@ -24,12 +24,16 @@ root=`echo "import os; print os.path.realpath('$1')" | python`
 
 addr=$2
 if [ "$addr" = "" ]; then
-    ip="*"
+    host="localhost"
+    listen="*"
     port="5432"
 else
-    ip=`$here/../../modules/http/httpd-addr ip $addr`
-    if [ "$ip" = "" ]; then
-        ip="*"
+    host=`$here/../../modules/http/httpd-addr ip $addr`
+    if [ "$host" = "" ]; then
+        host="localhost"
+        listen="*"
+    else
+        listen=$host
     fi
     port=`$here/../../modules/http/httpd-addr port $addr`
 fi
@@ -38,6 +42,8 @@ bport=`expr $port + 1000`
 pgsql_prefix=`cat $here/pgsql.prefix`
 pgbouncer_prefix=`cat $here/pgbouncer.prefix`
 
+user=`id -un`
+
 mkdir -p $root/sqldb/data
 chmod 700 $root/sqldb/data
 mkdir -p $root/sqldb/archive
@@ -50,6 +56,7 @@ else
     pgsql_log="cat >>$root/logs/postgresql"
 fi
 mkdir -p $root/sqldb
+mkdir -p $root/sqldb/tmp
 echo $pgsql_log >$root/sqldb/logger
 
 # Initialize PostgreSQL
@@ -77,12 +84,13 @@ log_lock_waits = on
 log_statement = none
 
 # Listen
-listen_addresses = '$ip'
+listen_addresses = '$listen'
 port = $port
+unix_socket_directory = '$root/sqldb/tmp'
 
 # Setup archival
 archive_mode = on
-archive_command = '$here/pgsql-archive $root localhost $bport %p %f'
+archive_command = '$here/pgsql-archive $root $host $bport %p %f'
 
 # Setup hot standby with streaming replication
 wal_level = hot_standby
@@ -114,12 +122,16 @@ while [ $sti -ne 30 ]; do
     sti=$((sti+1))
 done
 
-$pgsql_prefix/bin/createdb -h localhost -p $port db 2>&1 | sh $root/sqldb/logger
+$pgsql_prefix/bin/createdb -h $host -p $port db 2>&1 | sh $root/sqldb/logger
+
+# Create default user roles
+$pgsql_prefix/bin/psql -h $host -p $port -c "create role standby with login replication" db 2>&1 | sh $root/sqldb/logger
+$pgsql_prefix/bin/psql -h $host -p $port -c "create role bouncer with login" db 2>&1 | sh $root/sqldb/logger
 
 # Backup the db if there's no backup for it yet
 baks=`ls $root/sqldb/archive | sort -r  | grep "\.backup\.tar\.gz$"`
 if [ "$baks" = "" ]; then
-    $here/pgsql-backup $root localhost $port
+    $here/pgsql-backup $root $host $port
 fi
 
 $pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger
@@ -151,12 +163,13 @@ id=`id -un`
 cat >$root/sqldb/data/pgbouncer.conf <<EOF
 
 [databases]
-db = host=localhost dbname=db
+db = host=$host port=$port dbname=db user=bouncer
 
 [pgbouncer]
 pool_mode = session
+listen_addr = $listen
 listen_port = $bport
-listen_addr = $ip
+unix_socket_dir =
 auth_type = trust
 auth_file=$root/sqldb/data/pgbouncer-auth.conf
 logfile = $root/logs/pgbouncer
diff --git a/sca-cpp/trunk/components/sqldb/pgsql-standby-conf b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf
index 77d1dfa8e2..5f76b5b332 100755
--- a/sca-cpp/trunk/components/sqldb/pgsql-standby-conf
+++ b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf
@@ -25,12 +25,16 @@ root=`echo "import os; print os.path.realpath('$1')" | python`
 # Server address
 addr=$2
 if [ "$addr" = "" ]; then
-    ip="*"
+    host="localhost"
+    listen="*"
     port="5432"
 else
-    ip=`$here/../../modules/http/httpd-addr ip $addr`
-    if [ "$ip" = "" ]; then
-        ip="*"
+    host=`$here/../../modules/http/httpd-addr ip $addr`
+    if [ "$host" = "" ]; then
+        host="localhost"
+        listen="*"
+    else
+        listen=$host
     fi
     port=`$here/../../modules/http/httpd-addr port $addr`
 fi
@@ -50,6 +54,8 @@ fi
 pgsql_prefix=`cat $here/pgsql.prefix`
 pgbouncer_prefix=`cat $here/pgbouncer.prefix`
 
+user=`id -un`
+
 mkdir -p $root/sqldb/data
 chmod 700 $root/sqldb/data
 mkdir -p $root/sqldb/archive
@@ -62,6 +68,7 @@ else
     pgsql_log="cat >>$root/logs/postgresql"
 fi
 mkdir -p $root/sqldb
+mkdir -p $root/sqldb/tmp
 echo $pgsql_log >$root/sqldb/logger
 
 # Initialize from a backup of the master
@@ -95,12 +102,13 @@ log_lock_waits = on
 log_statement = none
 
 # Listen
-listen_addresses = '$ip'
+listen_addresses = '$listen'
 port = $port
+unix_socket_directory = '$root/sqldb/tmp'
 
 # Setup archival
 archive_mode = on
-archive_command = '$here/pgsql-archive $root localhost $bport %p %f'
+archive_command = '$here/pgsql-archive $root $host $bport %p %f'
 
 # Setup hot standby with streaming replication
 wal_level = hot_standby
@@ -118,7 +126,7 @@ cat >$root/sqldb/data/recovery.conf << EOF
 
 # Start in standby mode
 standby_mode = 'on'
-primary_conninfo = 'host=$mhost port=$mport'
+primary_conninfo = 'host=$mhost port=$mport user=standby'
 
 # Failover
 trigger_file = '$root/sqldb/failover'
@@ -154,12 +162,13 @@ id=`id -un`
 cat >$root/sqldb/data/pgbouncer.conf <<EOF
 
 [databases]
-db = host=localhost dbname=db
+db = host=$host port=$port dbname=db user=bouncer
 
 [pgbouncer]
 pool_mode = session
+listen_addr = $listen
 listen_port = $bport
-listen_addr = $ip
+unix_socket_dir =
 auth_type = trust
 auth_file=$root/sqldb/data/pgbouncer-auth.conf
 logfile = $root/logs/pgbouncer