From dc854d379b8c4c367212e0cc38c890e216ada54d Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 29 Jun 2020 23:23:32 +0200 Subject: [PATCH] adapt to release 3.5.1 --- docs/mkdocs.yml | 2 +- osm2pgsql | 2 +- vagrant/Install-on-Centos-7.sh | 10 +++++----- vagrant/Install-on-Centos-8.sh | 10 +++++----- vagrant/Install-on-Ubuntu-18.sh | 6 +++--- vagrant/Install-on-Ubuntu-20.sh | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 28a4f56a..d19a7def 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Nominatim 3.5.0 +site_name: Nominatim 3.5.1 theme: readthedocs docs_dir: ${CMAKE_CURRENT_BINARY_DIR} site_url: https://nominatim.org diff --git a/osm2pgsql b/osm2pgsql index cb7655a4..2909ff20 160000 --- a/osm2pgsql +++ b/osm2pgsql @@ -1 +1 @@ -Subproject commit cb7655a4ff7df7c93eb444e36035701b92b2ec35 +Subproject commit 2909ff20ef0df9963f1ffc29b83b7d66b1a21994 diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh index 2f9a0eef..25b37dc1 100755 --- a/vagrant/Install-on-Centos-7.sh +++ b/vagrant/Install-on-Centos-7.sh @@ -163,8 +163,8 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - wget https://nominatim.org/release/Nominatim-3.5.0.tar.bz2 - tar xf Nominatim-3.5.0.tar.bz2 + wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2 + tar xf Nominatim-3.5.1.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: @@ -176,7 +176,7 @@ fi #DOCS: cd $USERHOME mkdir build cd build - cmake $USERHOME/Nominatim-3.5.0 + cmake $USERHOME/Nominatim-3.5.1 make # @@ -187,10 +187,10 @@ fi #DOCS: # 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-3.5.0/(website|lib|settings)(/.*)?" + 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/build/(website|lib|settings)(/.*)?" sudo semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so" - sudo restorecon -R -v $USERHOME/Nominatim-3.5.0 + sudo restorecon -R -v $USERHOME/Nominatim-3.5.1 sudo restorecon -R -v $USERHOME/build diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh index 7de2d998..0930085d 100755 --- a/vagrant/Install-on-Centos-8.sh +++ b/vagrant/Install-on-Centos-8.sh @@ -157,8 +157,8 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - wget https://nominatim.org/release/Nominatim-3.5.0.tar.bz2 - tar xf Nominatim-3.5.0.tar.bz2 + wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2 + tar xf Nominatim-3.5.1.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: @@ -170,7 +170,7 @@ fi #DOCS: cd $USERHOME mkdir build cd build - cmake $USERHOME/Nominatim-3.5.0 + cmake $USERHOME/Nominatim-3.5.1 make # @@ -181,10 +181,10 @@ fi #DOCS: # 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-3.5.0/(website|lib|settings)(/.*)?" + 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/build/(website|lib|settings)(/.*)?" sudo semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so" - sudo restorecon -R -v $USERHOME/Nominatim-3.5.0 + sudo restorecon -R -v $USERHOME/Nominatim-3.5.1 sudo restorecon -R -v $USERHOME/build diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh index 2555cf7a..631ddc06 100755 --- a/vagrant/Install-on-Ubuntu-18.sh +++ b/vagrant/Install-on-Ubuntu-18.sh @@ -139,8 +139,8 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - wget https://nominatim.org/release/Nominatim-3.5.0.tar.bz2 - tar xf Nominatim-3.5.0.tar.bz2 + wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2 + tar xf Nominatim-3.5.1.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: @@ -151,7 +151,7 @@ fi #DOCS: cd $USERHOME #DOCS: :::sh mkdir build cd build - cmake $USERHOME/Nominatim-3.5.0 + cmake $USERHOME/Nominatim-3.5.1 make # You need to create a minimal configuration file that tells nominatim diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index 8b6402ce..b04cd232 100644 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -134,8 +134,8 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - wget https://nominatim.org/release/Nominatim-3.5.0.tar.bz2 - tar xf Nominatim-3.5.0.tar.bz2 + wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2 + tar xf Nominatim-3.5.1.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: @@ -153,7 +153,7 @@ fi #DOCS: cd $USERHOME mkdir build cd build - cmake $USERHOME/Nominatim-3.5.0 + cmake $USERHOME/Nominatim-3.5.1 make # You need to create a minimal configuration file that tells nominatim