[master][noticket][s]: Tidy up deploy process. Install pastescript in…

…to virtualenv to make it easier for operator to run paste commands later on.
ckan · Jan 16, 2012 · 942d302 · 942d302 · flowma · Nov 21, 2012
1 parent b772f52
commit 942d302
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ckan_deb/usr/bin/ckan-create-instance b/ckan_deb/usr/bin/ckan-create-instance
@@ -10,7 +10,7 @@ fi
 
 if [ $# -lt 3 ]
 then    
-    echo "ERROR: Expected two arguments (instance name, hostname, local database [yes or no]) eg."
+    echo "ERROR: Wrong number of arguments. Expected: (instance name, hostname, local database [yes or no]) e.g."
     echo "       $0 std std.ckan.org yes"
     exit 1
 fi

diff --git a/ckan_deb/usr/lib/ckan/common.sh b/ckan_deb/usr/lib/ckan/common.sh
@@ -177,6 +177,9 @@ ckan_create_wsgi_handler () {
             echo "Attempting to install 'pip' 1.0 from pypi.python.org into pyenv to be used for extensions ..."
             sudo -u ckan${INSTANCE} /var/lib/ckan/${INSTANCE}/pyenv/bin/easy_install --upgrade "pip>=1.0" "pip<=1.0.99"
             echo "done."
+            echo "Attempting to install 'paster' pypi.python.org into pyenv ..."
+            sudo -u ckan${INSTANCE} /var/lib/ckan/${INSTANCE}/pyenv/bin/easy_install --ignore-installed "pastescript"
+            echo "done."
             cat <<- EOF > /var/lib/ckan/${INSTANCE}/packaging_version.txt
 	1.5
 	EOF