Revert "increase weight for country tokens"

[nominatim.git] / vagrant / Install-on-Ubuntu-18.sh

diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh
index 062d7ceebe26a66e34e388e9ee6f44202cf965a8..c27a5d4046456fce8854ac78d4a8daa98742a69a 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-18.sh
+++ b/vagrant/Install-on-Ubuntu-18.sh
@@ -25,11 +25,11 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 # Now you can install all packages needed for Nominatim:
 
     sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \
 # Now you can install all packages needed for Nominatim:
 
     sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \

-                            libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
+                            libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev \

                             libbz2-dev libpq-dev libproj-dev \
                             postgresql-server-dev-10 postgresql-10-postgis-2.4 \
                             libbz2-dev libpq-dev libproj-dev \
                             postgresql-server-dev-10 postgresql-10-postgis-2.4 \

-                            postgresql-contrib-10 \
-                            apache2 php php-pgsql libapache2-mod-php php-pear php-db \
+                            postgresql-contrib-10 postgresql-10-postgis-scripts \
+                            apache2 php php-pgsql libapache2-mod-php \

                             php-intl git
 
 # If you want to run the test suite, you need to install the following
                             php-intl git
 
 # If you want to run the test suite, you need to install the following


@@ -39,7 +39,9 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                             python3-psycopg2 python3-tidylib phpunit php-cgi
 
     pip3 install --user behave nose
                             python3-psycopg2 python3-tidylib phpunit php-cgi
 
     pip3 install --user behave nose

-    sudo pear install PHP_CodeSniffer
+
+    composer global require "squizlabs/php_codesniffer=*"
+    sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/

 
 #
 # System Configuration
 
 #
 # System Configuration


@@ -77,7 +79,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 # ---------------------
 #
 # Tune the postgresql configuration, which is located in 
 # ---------------------
 #
 # Tune the postgresql configuration, which is located in 

-# `/etc/postgresql/9.5/main/postgresql.conf`. See section *Postgres Tuning* in
+# `/etc/postgresql/10/main/postgresql.conf`. See section *Postgres Tuning* in

 # [the installation page](../admin/Installation.md#postgresql-tuning)
 # for the parameters to change.
 #
 # [the installation page](../admin/Installation.md#postgresql-tuning)
 # for the parameters to change.
 #