From 23700349b9bb07521921b28a6a54fa466e1fb94c Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Sat, 28 Jun 2014 23:12:23 +0530
Subject: [PATCH] moved configuration bits to init script

---
 Dockerfile           |  4 ++--
 assets/init          | 13 +++++++++++++
 assets/setup/install | 32 --------------------------------
 3 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 assets/setup/install

diff --git a/Dockerfile b/Dockerfile
index fb76ce6..532cc62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,11 @@ MAINTAINER sameer@damagehead.com
 
 RUN apt-get update && \
 		apt-get install -y postgresql postgresql-client && \
+		rm -rf /var/lib/postgresql &&  \
 		apt-get clean # 20140525
 
 ADD assets/ /app/
-RUN chmod 755 /app/init /app/setup/install
-RUN /app/setup/install
+RUN chmod 755 /app/init
 
 EXPOSE 5432
 
diff --git a/assets/init b/assets/init
index 5f47d82..59097e0 100755
--- a/assets/init
+++ b/assets/init
@@ -6,6 +6,19 @@ set -e
 chown -R postgres:postgres /var/lib/postgresql
 chmod 700 /var/lib/postgresql
 
+# disable ssl
+sed 's/ssl = true/#ssl = true/' -i /etc/postgresql/9.1/main/postgresql.conf
+
+# listen on all interfaces
+cat >> /etc/postgresql/9.1/main/postgresql.conf <<EOF
+listen_addresses = '*'
+EOF
+
+# allow remote connections to postgresql database
+cat >> /etc/postgresql/9.1/main/pg_hba.conf <<EOF
+host    all             all             0.0.0.0/0               md5
+EOF
+
 # initialize PostgreSQL data directory
 if [ ! -d /var/lib/postgresql/9.1/main ]; then
 	echo "Initializing database..."
diff --git a/assets/setup/install b/assets/setup/install
deleted file mode 100644
index d991ff7..0000000
--- a/assets/setup/install
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-set -e
-
-# make sure ssl is disabled
-sed 's/ssl = true/#ssl = true/' -i /etc/postgresql/9.1/main/postgresql.conf
-
-# listen on all interfaces
-cat >> /etc/postgresql/9.1/main/postgresql.conf <<EOF
-listen_addresses = '*'
-EOF
-
-# allow remote connections to postgresql database
-cat >> /etc/postgresql/9.1/main/pg_hba.conf <<EOF
-host    all             all             0.0.0.0/0               md5
-EOF
-
-# remove the default database, will create from init
-rm -rf /var/lib/postgresql/9.1/main
-
-echo ""
-echo "*************************************************************************"
-echo "* Please login to postgresql and create the required database and       *"
-echo "* database user with remote login access so that other containers can   *"
-echo "* use it.                                                               *"
-echo "*                                                                       *"
-echo "* e.g.                                                                  *"
-echo "*   sudo -u postgres createuser db_user                                 *"
-echo "*   sudo -u postgres psql                                               *"
-echo "*   > \password db_user                                                 *"
-echo "*   sudo -u postgres createdb -O db_user db_name                        *"
-echo "*************************************************************************"
-echo ""