diff options
| -rw-r--r-- | INSTALL.md | 8 | ||||
| -rwxr-xr-x | install/ishtar-install | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/INSTALL.md b/INSTALL.md index 4c9945306..459f1e330 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -8,10 +8,12 @@ This procedure only works for Debian Jessie/Stretch for now. If you know bash and your distribution the script should be easy to adapt (contributions are welcomed!). ``` + +VERSION=latest # could also be 'develop' # get the last install script (only work for Debian) -wget https://ishtar-archeo.net/install/install-ishtar-latest.tar.bz2 -tar xvjf install-ishtar-latest.tar.bz2 -rm install-ishtar-latest.tar.bz2 +wget https://ishtar-archeo.net/install/install-ishtar-$VERSION.tar.bz2 +tar xvjf install-ishtar-$VERSION.tar.bz2 +rm install-ishtar-$VERSION.tar.bz2 # install Ishtar script cd install diff --git a/install/ishtar-install b/install/ishtar-install index d189309fc..f9c841cb6 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -317,6 +317,16 @@ EOF echo ""; ( set -x; $sh_c 'sleep 3; apt-get install -y -q python-pip' ) fi + + echo "-------------------------------------------------------------------------------"; + cecho y "Installing dnsmasq..."; + echo ""; + ( set -x; $sh_c 'sleep 3; apt-get install -y -q dnsmasq' ) + + echo "-------------------------------------------------------------------------------"; + cecho y "Installing python-setuptools..."; + echo ""; + ( set -x; $sh_c 'sleep 3; apt-get install -y -q python-setuptools python-wheel' ) if [ "$webserver" == 'nginx' ]; then echo "-------------------------------------------------------------------------------"; cecho y "Installing nginx and uwsgi..."; @@ -403,7 +413,7 @@ EOF cecho y "Installing postgresql" echo "" POSTGIS=postgresql-9.6-postgis-2.3 - ( set -x; $sh_c 'sleep 3; apt-get install -y -q postgresql '$POSTGIS ) + ( set -x; $sh_c 'sleep 3; apt-get install -y -q postgresql' $POSTGIS $POSTGIS'-scripts' ) fi echo "-------------------------------------------------------------------------------"; cecho y "Installing Ishtar dependencies" @@ -413,7 +423,7 @@ EOF ( set -x; $sh_c 'sleep 3; apt-get install -t stretch-backports -y -q python-django' ) ( set -x; $sh_c 'sleep 3; apt-get install -y -q \ python-django-registration libpangocairo-1.0-0 python-requests \ - python-bs4 python-cffi python-django-compressor pandoc dnsmasq \ + python-bs4 python-cffi python-django-compressor pandoc libjs-jquery\ python-tidylib python-lxml python-imaging python-html5lib \ python-psycopg2 python-gdal gettext python-unicodecsv memcached \ python-django-extra-views python-memcache python-dbf python-markdown \ @@ -427,7 +437,7 @@ EOF django-extensions==1.7.4' ) ( set -x; $sh_c 'sleep 3; apt-get install -y -q \ libpangocairo-1.0-0 python-requests \ - python-bs4 python-cffi \ + python-bs4 python-cffi pandoc libjs-jquery \ python-tidylib python-lxml python-imaging python-html5lib \ python-psycopg2 python-gdal gettext python-unicodecsv memcached \ python-memcache python-dbf python-markdown \ |