[ckan-changes] commit/ckanext-std: jame... at okfn.org: Fixes

Mon Jun 27 13:12:36 UTC 2011

1 new changeset in ckanext-std:

http://bitbucket.org/okfn/ckanext-std/changeset/f6dee1671c67/
changeset:   f6dee1671c67
user:        jame... at okfn.org
date:        2011-06-27 15:12:25
summary:     Fixes
affected #:  1 file (6 bytes)

--- a/package/usr/bin/ckan-std-install	Mon Jun 27 11:59:44 2011 +0100
+++ b/package/usr/bin/ckan-std-install	Mon Jun 27 14:12:25 2011 +0100
@@ -40,6 +40,12 @@
 echo "Making sure PostgreSQL is running ..."
 /etc/init.d/postgresql-8.4 start
 
+echo "Ensuring users and groups are set up correctly ..."
+ckan_ensure_users_and_groups ${INSTANCE}
+
+echo "Ensuring directories exist for ${INSTANCE} CKAN INSTANCE ..."
+ckan_make_ckan_directories ${INSTANCE}
+
 # Disable any existing crontabs during the upgrade, we don't want
 # scripts running when things are still changing
 echo "Disabling the crontab for the ckan${INSTANCE} user ..."
@@ -50,18 +56,12 @@
 crontab -u ckan${INSTANCE} ${PACKAGED_CRONJOB}
 
 # Try to put CKAN into maintenance mode, if it is installed
-if ! [ -f /etc/apache2/sites-available/${INSTANCE}.maint ] ; then
+if [ -f /etc/apache2/sites-available/${INSTANCE}.maint ] ; then
     # We have a maintence mode available
     echo "Putting CKAN into maintenance mode ..."
     ckan_maintenance_on ${INSTANCE}
 fi
 
-echo "Ensuring users and groups are set up correctly ..."
-ckan_ensure_users_and_groups ${INSTANCE}
-
-echo "Ensuring directories exist for ${INSTANCE} CKAN INSTANCE ..."
-ckan_make_ckan_directories ${INSTANCE}
-
 echo "Setting log file permissions so that both Apache and cron jobs can log to the same place ..."
 ckan_set_log_file_permissions ${INSTANCE}
 
@@ -92,9 +92,9 @@
     -i /etc/ckan/${INSTANCE}/${INSTANCE}.ini
 
 # Overwrite the existing Apache config
-if [ -f /etc/apache2/sites-enabled/default ] ; then
+if [ -f /etc/apache2/sites-enabled/000-default ] ; then
     echo "Disabling the default Apache site ..."
-    a2dissite default
+    a2dissite 000-default
 fi
 
 echo "Overwriting the existing Apache config ..."

Repository URL: https://bitbucket.org/okfn/ckanext-std/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


