Merge pull request #2164 from lonvia/add-make-install

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

diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh
index b182ecfd167c381faae60c2c9954085a3537eeb4..94afca784428e4644452f9b19e9f3c6aaffd6629 100644 (file)
--- a/vagrant/Install-on-Ubuntu-20.sh
+++ b/vagrant/Install-on-Ubuntu-20.sh
@@ -31,8 +31,8 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                         libboost-filesystem-dev libexpat1-dev zlib1g-dev \
                         libbz2-dev libpq-dev libproj-dev \
                         postgresql-server-dev-12 postgresql-12-postgis-3 \
                         libboost-filesystem-dev libexpat1-dev zlib1g-dev \
                         libbz2-dev libpq-dev libproj-dev \
                         postgresql-server-dev-12 postgresql-12-postgis-3 \

-                        postgresql-contrib postgresql-12-postgis-3-scripts \
-                        php php-pgsql php-intl \
+                        postgresql-contrib-12 postgresql-12-postgis-3-scripts \
+                        php php-pgsql php-intl python3-dotenv \

                         python3-psycopg2 git
 
 #
                         python3-psycopg2 git
 
 #


@@ -161,16 +161,6 @@ EOFAPACHECONF
     sudo a2enconf nominatim
     sudo systemctl restart apache2
 
     sudo a2enconf nominatim
     sudo systemctl restart apache2
 

-# You need to create a minimal configuration file that tells nominatim
-# where it is located on the webserver:
-
-#DOCS:```sh
-tee settings/local.php << EOF
-<?php
- @define('CONST_Website_BaseURL', '/nominatim/');
-EOF
-#DOCS:```
-

 # The Nominatim API is now available at `http://localhost/nominatim/`.
 
 fi   #DOCS:
 # The Nominatim API is now available at `http://localhost/nominatim/`.
 
 fi   #DOCS: