From: Sarah Hoffmann Date: Sun, 9 Feb 2020 11:20:04 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~256 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/49449b15badc204d57e1f99661ac05b7dbecdd09?hp=aed9d9c85e30b45f3e0ce4d9e3639b8ab0875e77 Merge remote-tracking branch 'upstream/master' --- diff --git a/Vagrantfile b/Vagrantfile index 4740f879..fa23bd18 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -61,6 +61,18 @@ Vagrant.configure("2") do |config| sub.vm.synced_folder ".", "/vagrant", disabled: true end + config.vm.define "centos8" do |sub| + sub.vm.box = "generic/centos8" + sub.vm.provision :shell do |s| + s.path = "vagrant/Install-on-Centos-8.sh" + s.privileged = false + s.args = "yes" + end + sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true + sub.vm.synced_folder ".", "/vagrant", disabled: true + end + + config.vm.provider "virtualbox" do |vb| vb.gui = false vb.memory = 2048 diff --git a/lib/Geocode.php b/lib/Geocode.php index 12410acc..c1d0c46f 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -907,12 +907,6 @@ class Geocode $aResult = array_merge($aResult, $aOutlineResult); } - if ($aResult['extra_place'] == 'city') { - $aResult['class'] = 'place'; - $aResult['type'] = 'city'; - $aResult['rank_search'] = 16; - } - // Is there an icon set for this type of result? $aClassInfo = ClassTypes\getInfo($aResult); diff --git a/utils/check_import_finished.php b/utils/check_import_finished.php index c6ccb67b..b81cace1 100755 --- a/utils/check_import_finished.php +++ b/utils/check_import_finished.php @@ -20,6 +20,13 @@ $print_fail = function ($message = 'Failed') use ($term_colors) { $oDB = new Nominatim\DB; +function isReverseOnlyInstallation() +{ + global $oDB; + return !$oDB->tableExists('search_name'); +} + + echo 'Checking database got created ... '; if ($oDB->databaseExists()) { $print_success(); @@ -107,13 +114,16 @@ $aExpectedIndices = array( 'idx_osmline_parent_osm_id', 'idx_place_osm_unique', 'idx_postcode_id', - 'idx_postcode_postcode', - - // sql/indices_search.src.sql - 'idx_search_name_nameaddress_vector', - 'idx_search_name_name_vector', - 'idx_search_name_centroid' + 'idx_postcode_postcode' ); +if (!isReverseOnlyInstallation()) { + $aExpectedIndices = array_merge($aExpectedIndices, array( + // sql/indices_search.src.sql + 'idx_search_name_nameaddress_vector', + 'idx_search_name_name_vector', + 'idx_search_name_centroid' + )); +} foreach ($aExpectedIndices as $sExpectedIndex) { echo "Checking index $sExpectedIndex ... "; diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh index f3debd8b..e2592f65 100755 --- a/vagrant/Install-on-Centos-7.sh +++ b/vagrant/Install-on-Centos-7.sh @@ -23,6 +23,12 @@ sudo yum install -y https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm sudo yum install -y centos-release-scl-rh +# More repositories for PHP 7 (default is PHP 5.4) + + sudo yum install -y http://rpms.remirepo.net/enterprise/remi-release-7.rpm + sudo yum-config-manager --enable remi-php72 + sudo yum update -y + # Now you can install all packages needed for Nominatim: #DOCS: :::sh @@ -33,19 +39,28 @@ devtoolset-7 llvm-toolset-7 \ php-pgsql php php-intl libpqxx-devel \ proj-epsg bzip2-devel proj-devel boost-devel \ + python3-pip python3-setuptools python3-devel \ expat-devel zlib-devel + # make sure pg_config gets found + echo 'PATH=/usr/pgsql-11/bin/:$PATH' >> ~/.bash_profile + source ~/.bash_profile + + pip3 install --user psycopg2 pytidylib + # If you want to run the test suite, you need to install the following # additional packages: #DOCS: :::sh - sudo yum install -y python34-pip python34-setuptools python34-devel \ - php-phpunit-PHPUnit - pip3 install --user behave nose pytidylib psycopg2 + sudo yum install -y php-dom php-mbstring + pip3 install --user behave nose composer global require "squizlabs/php_codesniffer=*" sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/ + composer global require "phpunit/phpunit=7.*" + sudo ln -s ~/.config/composer/vendor/bin/phpunit /usr/bin/ + # # System Configuration # ==================== @@ -85,9 +100,6 @@ sudo chown vagrant /srv/nominatim #DOCS: # CentOS does not automatically create a database cluster. Therefore, start # with initializing the database, then enable the server to start at boot: - echo 'PATH=$PATH:/usr/pgsql-11/bin' > .bash_profile - source .bash_profile - sudo /usr/pgsql-11/bin/postgresql-11-setup initdb sudo systemctl enable postgresql-11 diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh new file mode 100755 index 00000000..fdfec24b --- /dev/null +++ b/vagrant/Install-on-Centos-8.sh @@ -0,0 +1,211 @@ +#!/bin/bash +# +# *Note:* these installation instructions are also available in executable +# form for use with vagrant under `vagrant/Install-on-Centos-8.sh`. +# +# Installing the Required Software +# ================================ +# +# These instructions expect that you have a freshly installed CentOS version 8. +# Make sure all packages are up-to-date by running: +# + sudo dnf update -y + +# The standard CentOS repositories don't contain all the required packages, +# you need to enable the EPEL repository as well. For example for SELinux +# related redhat-hardened-cc1 package. To enable it on CentOS run: + + sudo dnf install -y epel-release redhat-rpm-config + +# EPEL contains Postgres 9.6 and 10, but not PostGIS. Postgres 9.4+/10/11/12 +# and PostGIS 2.4/2.5/3.0 are availble from postgresql.org + + sudo dnf -qy module disable postgresql + sudo dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm + +# Now you can install all packages needed for Nominatim: + +#DOCS: :::sh + sudo dnf --enablerepo=PowerTools install -y postgresql10-server \ + postgresql10-contrib postgresql10-devel postgis25_10 \ + wget git cmake make gcc gcc-c++ libtool policycoreutils-python-utils \ + llvm-toolset ccache clang-tools-extra \ + php-pgsql php php-intl php-json libpq-devel \ + proj52-epsg bzip2-devel proj-devel boost-devel \ + python3-pip python3-setuptools python3-devel \ + expat-devel zlib-devel + + # make sure pg_config gets found + echo 'PATH=/usr/pgsql-10/bin:$PATH' >> ~/.bash_profile + source ~/.bash_profile + + pip3 install --user psycopg2 pytidylib + +# If you want to run the test suite, you need to install the following +# additional packages: + +#DOCS: :::sh + sudo dnf install -y php-dom php-mbstring + pip3 install --user behave nose + + composer global require "squizlabs/php_codesniffer=*" + sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/ + + composer global require "phpunit/phpunit=^7" + sudo ln -s ~/.config/composer/vendor/bin/phpunit /usr/bin/ + +# +# System Configuration +# ==================== +# +# The following steps are meant to configure a fresh CentOS installation +# for use with Nominatim. You may skip some of the steps if you have your +# OS already configured. +# +# Creating Dedicated User Accounts +# -------------------------------- +# +# Nominatim will run as a global service on your machine. It is therefore +# best to install it under its own separate user account. In the following +# we assume this user is called nominatim and the installation will be in +# /srv/nominatim. To create the user and directory run: +# +sudo mkdir -p /srv/nominatim #DOCS: sudo useradd -d /srv/nominatim -s /bin/bash -m nominatim +sudo chown vagrant /srv/nominatim #DOCS: +# +# You may find a more suitable location if you wish. +# +# To be able to copy and paste instructions from this manual, export +# user name and home directory now like this: +# + export USERNAME=vagrant #DOCS: export USERNAME=nominatim + export USERHOME=/srv/nominatim +# +# **Never, ever run the installation as a root user.** You have been warned. +# +# Make sure that system servers can read from the home directory: + + chmod a+x $USERHOME + +# Setting up PostgreSQL +# --------------------- +# +# CentOS does not automatically create a database cluster. Therefore, start +# with initializing the database, then enable the server to start at boot: + + + sudo /usr/pgsql-10/bin/postgresql-10-setup initdb + sudo systemctl enable postgresql-10 + +# +# Next tune the postgresql configuration, which is located in +# `/var/lib/pgsql/data/postgresql.conf`. See section *Postgres Tuning* in +# [the installation page](../admin/Installation.md#postgresql-tuning) +# for the parameters to change. +# +# Now start the postgresql service after updating this config file. + + sudo systemctl restart postgresql-10 + +# +# Finally, we need to add two postgres users: one for the user that does +# the import and another for the webserver which should access the database +# only for reading: +# + + sudo -u postgres createuser -s $USERNAME + sudo -u postgres createuser apache + +# +# Setting up the Apache Webserver +# ------------------------------- +# +# You need to create an alias to the website directory in your apache +# configuration. Add a separate nominatim configuration to your webserver: + +#DOCS:```sh +sudo tee /etc/httpd/conf.d/nominatim.conf << EOFAPACHECONF + + Options FollowSymLinks MultiViews + AddType text/html .php + DirectoryIndex search.php + Require all granted + + +Alias /nominatim $USERHOME/build/website +EOFAPACHECONF +#DOCS:``` + +sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS: + +# +# Then reload apache +# + + sudo systemctl enable httpd + sudo systemctl restart httpd + + +# +# Installing Nominatim +# ==================== +# +# Building and Configuration +# -------------------------- +# +# Get the source code from Github and change into the source directory +# +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: + +# 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: :::sh + wget --no-verbose -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: + +#DOCS: :::sh + cd $USERHOME + mkdir build + cd build + cmake $USERHOME/Nominatim + make + +# +# Adding SELinux Security Settings +# -------------------------------- +# +# It is a good idea to leave SELinux enabled and enforcing, particularly +# with a web server accessible from the Internet. At a minimum the +# following SELinux labeling should be done for Nominatim: + + sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim/(website|lib|settings)(/.*)?" + sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/build/(website|lib|settings)(/.*)?" + sudo semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so" + sudo restorecon -R -v $USERHOME/Nominatim + sudo restorecon -R -v $USERHOME/build + + +# You need to create a minimal configuration file that tells nominatim +# the name of your webserver user and the URL of the website: + +#DOCS:```sh +tee settings/local.php << EOF +