[packaging] Apache reloads instead of restarts, and there is a more a…

…ccurate database existence check
ckan · Dec 16, 2011 · 906d6bc · 906d6bc
1 parent 29e505e
commit 906d6bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ckan_deb/usr/bin/ckan-create-instance b/ckan_deb/usr/bin/ckan-create-instance
@@ -144,8 +144,8 @@ echo "Bringing the ${INSTANCE} INSTANCE out of maintenance mode ..."
 ckan_maintenance_off ${INSTANCE}
 
 # Restart Apache so it is aware of any changes
-echo "Restarting apache ..."
-/etc/init.d/apache2 restart 
+echo "Reloading apache ..."
+/etc/init.d/apache2 reload 
 
 # Install the new crontab
 echo "Enabling crontab for the ckan${INSTANCE} user ..."

diff --git a/ckan_deb/usr/lib/ckan/common.sh b/ckan_deb/usr/lib/ckan/common.sh
@@ -151,7 +151,7 @@ ckan_ensure_db_exists () {
         exit 1
     else
         INSTANCE=$1
-        COMMAND_OUTPUT=`sudo -u postgres psql -l`
+        COMMAND_OUTPUT=`sudo -u postgres psql -c "select datname from pg_database where datname='$INSTANCE'"`
         if ! [[ "$COMMAND_OUTPUT" =~ ${INSTANCE} ]] ; then
             echo "Creating the database ..."
             sudo -u postgres createdb -O ${INSTANCE} ${INSTANCE}