summaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-08-26 18:15:03 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-08-26 18:15:03 +0200
commitc4d501e9ff7efe028b22ee11aa9c96defb78b801 (patch)
tree6ebf2e5a151124e81173d9c479a5bc9b20644fda /install
parent698c1c5d6996215ecf18c1ba43d4da5c6a35779e (diff)
downloadIshtar-c4d501e9ff7efe028b22ee11aa9c96defb78b801.tar.bz2
Ishtar-c4d501e9ff7efe028b22ee11aa9c96defb78b801.zip
Install script: add proxy for pip
Diffstat (limited to 'install')
-rwxr-xr-xinstall/install.sh9
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