diff options
| -rw-r--r-- | INSTALL.md | 4 | ||||
| -rwxr-xr-x | install/ishtar-install | 9 | ||||
| -rwxr-xr-x | install/ishtar-prepare-instance | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/INSTALL.md b/INSTALL.md index 96a04f985..d331e32e0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -15,7 +15,7 @@ rm install-ishtar-latest.tar.bz2 # install Ishtar script cd install -bash ./install-ishtar.sh +bash ./ishtar-install.sh ``` ``` @@ -46,4 +46,4 @@ rm initial_towns-fr-latest.tar.bz2 cd /srv/ishtar/my_ishtar_instance ./manage.py loaddata /srv/data/towns_norel-fr.json ./manage.py loaddata /srv/data/towns-fr.json -```
\ No newline at end of file +``` diff --git a/install/ishtar-install b/install/ishtar-install index 39680bab5..67c8808f0 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -117,7 +117,7 @@ do_install() { fi ;; - debian) + debian|raspbian) dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')" case "$dist_version" in 9) @@ -168,7 +168,7 @@ do_install() { check_forked case "$lsb_dist" in - ubuntu|debian) + ubuntu|debian|raspbian) ;; *) echo "" @@ -286,7 +286,7 @@ EOF # Run setup for each distro accordingly case "$lsb_dist" in - ubuntu|debian) + ubuntu|debian|raspbian) if [ "$dist_version" != "stretch" ] && [ "$dist_version" != "jessie" ]; then echo "" cecho r " Sorry this script cannot manage your version of Debian/Ubuntu." @@ -436,7 +436,8 @@ EOF ## not mandatory # cecho y "Installing python-django-background-tasks" # echo ""; - #( set -x; $sh_c 'pip install django-background-tasks==1.1.11' ) + #( set -x; $sh_c 'pip install django-background-tasks==1.1.11' + ) fi ;; diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index fced9602e..c89ff9259 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -26,7 +26,7 @@ do_install_instance() { NGINX_ENABLE_PATH='/etc/nginx/sites-enabled' UWSGI_AVAILABLE_PATH='/etc/uwsgi/apps-available' UWSGI_ENABLE_PATH='/etc/uwsgi/apps-enabled' - PG_VERSION=9.4 + PG_VERSION=9.6 POSTGIS_VERSION=2.3.1 echo "" |