X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6ebbbfee61eed2ba3ef337833ad60c328fadd0f8..c221e1fd56be892ca13b5a87e248d47d47996cd2:/vagrant/Install-on-Ubuntu-20.sh?ds=sidebyside diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index 0850644d..0f664da2 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -20,15 +20,20 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: # Now you can install all packages needed for Nominatim: - sudo apt install -y php-cgi sudo apt install -y build-essential cmake g++ libboost-dev libboost-system-dev \ libboost-filesystem-dev libexpat1-dev zlib1g-dev \ - libbz2-dev libpq-dev libproj-dev \ - postgresql-server-dev-12 postgresql-12-postgis-3 \ + libbz2-dev libpq-dev liblua5.3-dev lua5.3 lua-dkjson \ + postgresql-12-postgis-3 \ postgresql-contrib-12 postgresql-12-postgis-3-scripts \ - php php-pgsql php-intl libicu-dev python3-dotenv \ - python3-psycopg2 python3-psutil python3-jinja2 \ - python3-icu python3-datrie git + php-cli php-pgsql php-intl libicu-dev python3-dotenv \ + python3-psycopg2 python3-psutil python3-jinja2 python3-pip \ + python3-icu python3-datrie python3-yaml git + +# Some of the Python packages that come with Ubuntu 20.04 are too old, so +# install the latest version from pip: + + pip3 install --user sqlalchemy asyncpg + # # System Configuration @@ -50,6 +55,11 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: # # You may find a more suitable location if you wish. # +# The following instructions assume you are logged in as this user. +# You can also switch to the user with: +# +# sudo -u nominatim bash +# # To be able to copy and paste instructions from this manual, export # user name and home directory now like this: # @@ -75,9 +85,9 @@ fi #DOCS: # Restart the postgresql service after updating this config file. if [ "x$NOSYSTEMD" == "xyes" ]; then #DOCS: - sudo pg_ctlcluster 12 main start + sudo pg_ctlcluster 12 main start #DOCS: else #DOCS: - sudo systemctl restart postgresql #DOCS: + sudo systemctl restart postgresql fi #DOCS: # # Finally, we need to add two postgres users: one for the user that does @@ -99,7 +109,7 @@ fi #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git + git clone --recursive https://github.com/openstreetmap/Nominatim.git cd Nominatim else #DOCS: cd $USERHOME/Nominatim #DOCS: @@ -109,7 +119,7 @@ fi #DOCS: # download the country grid: 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 + wget -O data/country_osm_grid.sql.gz https://nominatim.org/data/country_grid.sql.gz fi #DOCS: # The code must be built in a separate directory. Create this directory, @@ -197,7 +207,7 @@ if [ "x$2" == "xinstall-nginx" ]; then #DOCS: sudo tee /etc/php/7.4/fpm/pool.d/www.conf << EOF_PHP_FPM_CONF [www] ; Replace the tcp listener and add the unix socket -listen = /var/run/php7.4-fpm.sock +listen = /var/run/php-fpm-nominatim.sock ; Ensure that the daemon runs as the correct user listen.owner = www-data @@ -232,7 +242,7 @@ server { fastcgi_param SCRIPT_FILENAME "\$document_root\$uri.php"; fastcgi_param PATH_TRANSLATED "\$document_root\$uri.php"; fastcgi_param QUERY_STRING \$args; - fastcgi_pass unix:/var/run/php7.4-fpm.sock; + fastcgi_pass unix:/var/run/php-fpm-nominatim.sock; fastcgi_index index.php; include fastcgi_params; } @@ -242,7 +252,7 @@ server { if (!-f \$document_root\$fastcgi_script_name) { return 404; } - fastcgi_pass unix:/var/run/php7.4-fpm.sock; + fastcgi_pass unix:/var/run/php-fpm-nominatim.sock; fastcgi_index search.php; include fastcgi.conf; } @@ -250,15 +260,15 @@ server { EOF_NGINX_CONF #DOCS:``` -# If you have some errors, make sure that php7.4-fpm.sock is well under +# If you have some errors, make sure that php-fpm-nominatim.sock is well under # /var/run/ and not under /var/run/php. Otherwise change the Nginx configuration -# to /var/run/php/php7.4-fpm.sock. +# to /var/run/php/php-fpm-nominatim.sock. # # Enable the configuration and restart Nginx # if [ "x$NOSYSTEMD" == "xyes" ]; then #DOCS: - sudo /usr/sbin/php-fpm7.3 --nodaemonize --fpm-config /etc/php/7.3/fpm/php-fpm.conf & #DOCS: + sudo /usr/sbin/php-fpm7.4 --nodaemonize --fpm-config /etc/php/7.4/fpm/php-fpm.conf & #DOCS: sudo /usr/sbin/nginx & #DOCS: else #DOCS: sudo systemctl restart php7.4-fpm nginx