X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cf32da374898282f26a3147fa8e8a79abc1c9347..c47d1f4900bd156ec28643e450248233a0241329:/vagrant/Install-on-Ubuntu-16.sh

diff --git a/vagrant/Install-on-Ubuntu-16.sh b/vagrant/Install-on-Ubuntu-16.sh
index 9c58d063..f05f2b63 100755
--- a/vagrant/Install-on-Ubuntu-16.sh
+++ b/vagrant/Install-on-Ubuntu-16.sh
@@ -18,6 +18,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 # Make sure all packages are are up-to-date by running:
 #
 
+#DOCS:    :::sh
     sudo apt-get -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" --force-yes -fuy install grub-pc #DOCS:
     sudo apt-get update -qq
 
@@ -25,9 +26,10 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 
     sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \
                             libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
-                            libbz2-dev libpq-dev libgeos-dev libgeos++-dev libproj-dev \
-                            postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 postgresql-contrib-9.5 \
-                            apache2 php php-pgsql libapache2-mod-php php-pear php-db \
+                            libbz2-dev libpq-dev libproj-dev \
+                            postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 \
+                            postgresql-contrib-9.5 \
+                            apache2 php php-pgsql libapache2-mod-php \
                             php-intl git
 
 # If you want to run the test suite, you need to install the following
@@ -36,8 +38,10 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
     sudo apt-get install -y python3-setuptools python3-dev python3-pip \
                             python3-psycopg2 python3-tidylib phpunit php-cgi
 
-    pip3 install --user behave nose # urllib3
-    sudo pear install PHP_CodeSniffer
+    pip3 install --user behave nose
+
+    composer global require "squizlabs/php_codesniffer=*"
+    sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/
 
 #
 # System Configuration
@@ -76,7 +80,8 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 #
 # Tune the postgresql configuration, which is located in 
 # `/etc/postgresql/9.5/main/postgresql.conf`. See section *Postgres Tuning* in
-# [the installation page](Installation.md) for the parameters to change.
+# [the installation page](../admin/Installation.md#postgresql-tuning)
+# for the parameters to change.
 #
 # Restart the postgresql service after updating this config file.
 
@@ -98,7 +103,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 # You need to create an alias to the website directory in your apache
 # configuration. Add a separate nominatim configuration to your webserver:
 
-#DOCS:```
+#DOCS:```sh
 sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF
 <Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
@@ -129,12 +134,10 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
 #
 # Get the source code from Github and change into the source directory
 #
-if [ "x$1" == "xyes" ]; then  #DOCS:
-
+if [ "x$1" == "xyes" ]; then  #DOCS:    :::sh
     cd $USERHOME
     git clone --recursive git://github.com/openstreetmap/Nominatim.git
     cd Nominatim
-
 else                               #DOCS:
     cd $USERHOME/Nominatim         #DOCS:
 fi                                 #DOCS:
@@ -142,14 +145,14 @@ fi                                 #DOCS:
 # When installing the latest source from github, you also need to
 # download the country grid:
 
-if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:
-    wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:    :::sh
+    wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
 fi                                 #DOCS:
 
 # The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there:
 
-    cd $USERHOME                   #DOCS:
+    cd $USERHOME                   #DOCS:    :::sh
     mkdir build
     cd build
     cmake $USERHOME/Nominatim
@@ -158,7 +161,7 @@ fi                                 #DOCS:
 # You need to create a minimal configuration file that tells nominatim
 # where it is located on the webserver:
 
-#DOCS:```
+#DOCS:```sh
 tee settings/local.php << EOF
 <?php
  @define('CONST_Website_BaseURL', '/nominatim/');
@@ -167,4 +170,4 @@ EOF
 
 
 # Nominatim is now ready to use. Continue with
-# [importing a database from OSM data](Import-and-Update.md).
+# [importing a database from OSM data](../admin/Import-and-Update.md).