hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt to release 3.5.2

Browse Source
This commit is contained in:
Sarah Hoffmann
2020-09-25 11:42:07 +02:00
parent d15f57e589
commit 4a6f7e3095
6 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/mkdocs.yml
View File

@@ -1,4 +1,4 @@
site_name: Nominatim 3.5.1 site_name: Nominatim 3.5.2
theme: readthedocs theme: readthedocs
docs_dir: ${CMAKE_CURRENT_BINARY_DIR} docs_dir: ${CMAKE_CURRENT_BINARY_DIR}
site_url: https://nominatim.org site_url: https://nominatim.org

12
vagrant/Install-on-Centos-7.sh
View File

@@ -35,7 +35,7 @@
sudo yum install -y postgresql11-server postgresql11-contrib postgresql11-devel \ sudo yum install -y postgresql11-server postgresql11-contrib postgresql11-devel \
postgis25_11 postgis25_11-utils \ postgis25_11 postgis25_11-utils \
wget git cmake make gcc gcc-c++ libtool policycoreutils-python \ wget cmake make gcc gcc-c++ libtool policycoreutils-python \
devtoolset-7 llvm-toolset-7 \ devtoolset-7 llvm-toolset-7 \
php-pgsql php php-intl libpqxx-devel \ php-pgsql php php-intl libpqxx-devel \
proj-epsg bzip2-devel proj-devel boost-devel \ proj-epsg bzip2-devel proj-devel boost-devel \
@@ -151,8 +151,8 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
# #
if [ "x$1" == "xyes" ]; then #DOCS: :::sh if [ "x$1" == "xyes" ]; then #DOCS: :::sh
cd $USERHOME cd $USERHOME
wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2 wget https://nominatim.org/release/Nominatim-3.5.2.tar.bz2
tar xf Nominatim-3.5.1.tar.bz2 tar xf Nominatim-3.5.2.tar.bz2
else #DOCS: else #DOCS:
cd $USERHOME/Nominatim #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #DOCS: fi #DOCS:
@@ -164,7 +164,7 @@ fi #DOCS:
cd $USERHOME cd $USERHOME
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim-3.5.1 cmake $USERHOME/Nominatim-3.5.2
make make
# #
@@ -175,10 +175,10 @@ fi #DOCS:
# with a web server accessible from the Internet. At a minimum the # with a web server accessible from the Internet. At a minimum the
# following SELinux labeling should be done for Nominatim: # following SELinux labeling should be done for Nominatim:
sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.5.1/(website|lib|settings)(/.*)?" sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.5.2/(website|lib|settings)(/.*)?"
sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/build/(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 semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so"
sudo restorecon -R -v $USERHOME/Nominatim-3.5.1 sudo restorecon -R -v $USERHOME/Nominatim-3.5.2
sudo restorecon -R -v $USERHOME/build sudo restorecon -R -v $USERHOME/build

12
vagrant/Install-on-Centos-8.sh
View File

@@ -28,7 +28,7 @@
#DOCS: :::sh #DOCS: :::sh
sudo dnf --enablerepo=PowerTools install -y postgresql12-server \ sudo dnf --enablerepo=PowerTools install -y postgresql12-server \
postgresql12-contrib postgresql12-devel postgis30_12 \ postgresql12-contrib postgresql12-devel postgis30_12 \
wget git cmake make gcc gcc-c++ libtool policycoreutils-python-utils \ wget cmake make gcc gcc-c++ libtool policycoreutils-python-utils \
llvm-toolset ccache clang-tools-extra \ llvm-toolset ccache clang-tools-extra \
php-pgsql php php-intl php-json libpq-devel \ php-pgsql php php-intl php-json libpq-devel \
bzip2-devel proj-devel boost-devel \ bzip2-devel proj-devel boost-devel \
@@ -145,8 +145,8 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
# #
if [ "x$1" == "xyes" ]; then #DOCS: :::sh if [ "x$1" == "xyes" ]; then #DOCS: :::sh
cd $USERHOME cd $USERHOME
wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2 wget https://nominatim.org/release/Nominatim-3.5.2.tar.bz2
tar xf Nominatim-3.5.1.tar.bz2 tar xf Nominatim-3.5.2.tar.bz2
else #DOCS: else #DOCS:
cd $USERHOME/Nominatim #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #DOCS: fi #DOCS:
@@ -158,7 +158,7 @@ fi #DOCS:
cd $USERHOME cd $USERHOME
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim-3.5.1 cmake $USERHOME/Nominatim-3.5.2
make make
# #
@@ -169,10 +169,10 @@ fi #DOCS:
# with a web server accessible from the Internet. At a minimum the # with a web server accessible from the Internet. At a minimum the
# following SELinux labeling should be done for Nominatim: # following SELinux labeling should be done for Nominatim:
sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.5.1/(website|lib|settings)(/.*)?" sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.5.2/(website|lib|settings)(/.*)?"
sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/build/(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 semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so"
sudo restorecon -R -v $USERHOME/Nominatim-3.5.1 sudo restorecon -R -v $USERHOME/Nominatim-3.5.2
sudo restorecon -R -v $USERHOME/build sudo restorecon -R -v $USERHOME/build

2
vagrant/Install-on-Ubuntu-18-nginx.sh
View File

@@ -24,7 +24,7 @@ export DEBIAN_FRONTEND=noninteractive
postgresql-contrib-10 \ postgresql-contrib-10 \
nginx php-fpm php php-pgsql \ nginx php-fpm php php-pgsql \
php-intl python3-setuptools python3-dev python3-pip \ php-intl python3-setuptools python3-dev python3-pip \
python3-psycopg2 python3-tidylib git python3-psycopg2 python3-tidylib
export USERNAME=vagrant export USERNAME=vagrant
export USERHOME=/home/vagrant export USERHOME=/home/vagrant

8
vagrant/Install-on-Ubuntu-18.sh
View File

@@ -31,7 +31,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
postgresql-contrib-10 postgresql-10-postgis-scripts \ postgresql-contrib-10 postgresql-10-postgis-scripts \
apache2 php php-pgsql libapache2-mod-php \ apache2 php php-pgsql libapache2-mod-php \
php-intl python3-setuptools python3-dev python3-pip \ php-intl python3-setuptools python3-dev python3-pip \
python3-psycopg2 python3-tidylib git python3-psycopg2 python3-tidylib
# #
@@ -127,8 +127,8 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
# #
if [ "x$1" == "xyes" ]; then #DOCS: :::sh if [ "x$1" == "xyes" ]; then #DOCS: :::sh
cd $USERHOME cd $USERHOME
wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2 wget https://nominatim.org/release/Nominatim-3.5.2.tar.bz2
tar xf Nominatim-3.5.1.tar.bz2 tar xf Nominatim-3.5.2.tar.bz2
else #DOCS: else #DOCS:
cd $USERHOME/Nominatim #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #DOCS: fi #DOCS:
@@ -139,7 +139,7 @@ fi #DOCS:
cd $USERHOME #DOCS: :::sh cd $USERHOME #DOCS: :::sh
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim-3.5.1 cmake $USERHOME/Nominatim-3.5.2
make make
# You need to create a minimal configuration file that tells nominatim # You need to create a minimal configuration file that tells nominatim

15
vagrant/Install-on-Ubuntu-20.sh
View File

@@ -33,7 +33,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
postgresql-contrib postgresql-12-postgis-3-scripts \ postgresql-contrib postgresql-12-postgis-3-scripts \
apache2 php php-pgsql libapache2-mod-php \ apache2 php php-pgsql libapache2-mod-php \
php-intl python3-setuptools python3-dev python3-pip \ php-intl python3-setuptools python3-dev python3-pip \
python3-psycopg2 python3-tidylib git python3-psycopg2 python3-tidylib
# #
# System Configuration # System Configuration
@@ -128,26 +128,19 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
# #
if [ "x$1" == "xyes" ]; then #DOCS: :::sh if [ "x$1" == "xyes" ]; then #DOCS: :::sh
cd $USERHOME cd $USERHOME
wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2 wget https://nominatim.org/release/Nominatim-3.5.2.tar.bz2
tar xf Nominatim-3.5.1.tar.bz2 tar xf Nominatim-3.5.2.tar.bz2
else #DOCS: else #DOCS:
cd $USERHOME/Nominatim #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #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 -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, # The code must be built in a separate directory. Create this directory,
# then configure and build Nominatim in there: # then configure and build Nominatim in there:
cd $USERHOME cd $USERHOME
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim-3.5.1 cmake $USERHOME/Nominatim-3.5.2
make make
# You need to create a minimal configuration file that tells nominatim # You need to create a minimal configuration file that tells nominatim