From b20a1531c1dc081e301a1b85cf7469a902249483 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 13 Dec 2020 14:37:34 +0100 Subject: [PATCH] adapt to release 3.6.0 --- docs/mkdocs.yml | 2 +- vagrant/Install-on-Centos-7.sh | 19 ++++++------------- vagrant/Install-on-Centos-8.sh | 19 ++++++------------- vagrant/Install-on-Ubuntu-18.sh | 13 +++---------- vagrant/Install-on-Ubuntu-20.sh | 13 +++---------- 5 files changed, 19 insertions(+), 47 deletions(-) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index b055e9f0..918ef200 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Nominatim Documentation +site_name: Nominatim 3.6.0 theme: readthedocs docs_dir: ${CMAKE_CURRENT_BINARY_DIR} site_url: https://nominatim.org diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh index c67aab7c..de465698 100755 --- a/vagrant/Install-on-Centos-7.sh +++ b/vagrant/Install-on-Centos-7.sh @@ -143,23 +143,16 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS: # Building and Configuration # -------------------------- # -# Get the source code from Github and change into the source directory +# Get the source code for the release and unpack it # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-3.6.0.tar.bz2 + tar xf Nominatim-3.6.0.tar.bz2 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: @@ -167,7 +160,7 @@ fi #DOCS: cd $USERHOME mkdir build cd build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-3.6.0 make # @@ -178,10 +171,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/(website|lib|settings)(/.*)?" + sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.6.0/(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/Nominatim-3.6.0 sudo restorecon -R -v $USERHOME/build diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh index 8559726b..0da22952 100755 --- a/vagrant/Install-on-Centos-8.sh +++ b/vagrant/Install-on-Centos-8.sh @@ -137,23 +137,16 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS: # Building and Configuration # -------------------------- # -# Get the source code from Github and change into the source directory +# Get the source code for the release and unpack it # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-3.6.0.tar.bz2 + tar xf Nominatim-3.6.0.tar.bz2 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: @@ -161,7 +154,7 @@ fi #DOCS: cd $USERHOME mkdir build cd build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-3.6.0 make # @@ -172,10 +165,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/(website|lib|settings)(/.*)?" + sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.6.0/(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/Nominatim-3.6.0 sudo restorecon -R -v $USERHOME/build diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh index bdf30056..5e60902b 100755 --- a/vagrant/Install-on-Ubuntu-18.sh +++ b/vagrant/Install-on-Ubuntu-18.sh @@ -97,26 +97,19 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-3.6.0.tar.bz2 + tar xf Nominatim-3.6.0.tar.bz2 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 -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: cd $USERHOME mkdir build cd build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-3.6.0 make diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index a05cc9fe..6494e8f8 100644 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -99,26 +99,19 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-3.6.0.tar.bz2 + tar xf Nominatim-3.6.0.tar.bz2 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 -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: cd $USERHOME mkdir build cd build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-3.6.0 make # Nominatim is now ready to use. You can continue with