diff options
| -rwxr-xr-x | install/install.sh | 9 | 
1 files changed, 7 insertions, 2 deletions
| diff --git a/install/install.sh b/install/install.sh index 798278638..6aa4ae31b 100755 --- a/install/install.sh +++ b/install/install.sh @@ -46,6 +46,11 @@ INSTALL_PREFIX=/srv/  # if a virtualenv is used put the full path of the python to use  PYTHON=python +# proxy for pip +PIP_OPTIONS='' +[ -z "$http_proxy" ] || PIP_OPTIONS=' --proxy '$http_proxy; +[ -z "$HTTP_PROXY" ] || PIP_OPTIONS=' --proxy '$HTTP_PROXY; +  # default for debian  UWSGI_AVAILABLE_PATH='/etc/uwsgi/apps-available/'  UWSGI_ENABLE_PATH='/etc/uwsgi/apps-enabled/' @@ -72,8 +77,8 @@ apt-get -q -y install python python-django \  apt-get -q -y install uwsgi uwsgi-plugin-python nginx memcached 2> /dev/null > /dev/null -pip install git+https://github.com/treyhunner/django-simple-history.git@0fd9b8e9c6f36b0141367b502420efe92d4e21ce 2> /dev/null > /dev/null -pip install BeautifulSoup4==4.3.2 +pip install$PIP_OPTIONS git+https://github.com/treyhunner/django-simple-history.git@0fd9b8e9c6f36b0141367b502420efe92d4e21ce 2> /dev/null > /dev/null +pip install$PIP_OPTIONS BeautifulSoup4==4.3.2  if [ -z "$DB_PASSWORD" ]  then | 
