From d407bdbbbcb23643e0cd1c9d565f47d2550bd988 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 30 Jan 2013 14:25:49 -0600 Subject: [PATCH] better scripts/setup-web2py-nginx-uwsgi-on-centos.sh, thanks Alan --- VERSION | 2 +- scripts/setup-web2py-nginx-uwsgi-on-centos.sh | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index e361f266..52249e85 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.01.30.12.47.24 +Version 2.4.1-alpha.2+timestamp.2013.01.30.14.25.06 diff --git a/scripts/setup-web2py-nginx-uwsgi-on-centos.sh b/scripts/setup-web2py-nginx-uwsgi-on-centos.sh index 09f1b81b..c10e3951 100644 --- a/scripts/setup-web2py-nginx-uwsgi-on-centos.sh +++ b/scripts/setup-web2py-nginx-uwsgi-on-centos.sh @@ -12,7 +12,13 @@ # available at your Centos package repository. # This change was made in order to get the latest # stable libraries available for avoiding compatibility -# issues. +# +# A bug was reported for the 2.7.3 version of python +# here http://bugs.python.org/issue14572 +# in case you choose to change to VERSION=2.7 +# (see below) mind that the automatic patch applied +# could not work for your environment. By default, +# Python 2.6 is installed. # # It was originally posted in this web2py-users group # thread: https://groups.google.com/forum/?fromgroups# @@ -29,7 +35,7 @@ # This is needed for the nginx installation. # # File : setup-web2py-nginx-uwsgi-on-centos.sh -# Author : Hutchinson +# Author : Peter Hutchinson # Modified by : Alan Etkin # Email : spametki@gmail.com # Copyright : web2py @@ -56,8 +62,8 @@ bzip2-devel sqlite-devel db4-devel openssl-devel tk-devel bluez-libs-devel # to fit your deployment needs. # Python options -PREFIX=2.7 -VERSION=2.7.3 +PREFIX=2.6 +VERSION=2.6.8 # uWSGI options version=uwsgi-1.2.4 @@ -71,8 +77,10 @@ wget http://www.python.org/ftp/python/$VERSION/Python-$VERSION.tgz tar xvfz Python-$VERSION.tgz cd Python-$VERSION -echo "Applying patch for sqlite3 bug from post http://bugs.python.org/msg161076" -curl -sk https://raw.github.com/gist/2727063/ | patch -p1 +if [ "$VERSION" == "2.7.3" ]; then + echo "Applying patch for sqlite3 bug from post http://bugs.python.org/msg161076" + curl -sk https://raw.github.com/gist/2727063/ | patch -p1 +fi ./configure --prefix=/opt/python$PREFIX --with-threads --enable-shared make