diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 3301356d..785ea3fb 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Nominatim Manual +site_name: Nominatim 4.3.0 Manual theme: name: material features: diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index 720e80c8..8016f8c0 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -27,7 +27,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: postgresql-contrib-12 postgresql-12-postgis-3-scripts \ 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 + python3-icu python3-datrie python3-yaml # Some of the Python packages that come with Ubuntu 20.04 are too old, so # install the latest version from pip: @@ -109,25 +109,18 @@ fi #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive https://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-4.3.0.tar.bz2 + tar xf Nominatim-4.3.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://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: mkdir $USERHOME/build cd $USERHOME/build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-4.3.0 make sudo make install diff --git a/vagrant/Install-on-Ubuntu-22.sh b/vagrant/Install-on-Ubuntu-22.sh index 174b8a77..957bef2e 100755 --- a/vagrant/Install-on-Ubuntu-22.sh +++ b/vagrant/Install-on-Ubuntu-22.sh @@ -28,7 +28,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: php-cli php-pgsql php-intl libicu-dev python3-dotenv \ python3-psycopg2 python3-psutil python3-jinja2 \ python3-icu python3-datrie python3-sqlalchemy \ - python3-asyncpg python3-yaml git + python3-asyncpg python3-yaml # # System Configuration @@ -104,25 +104,18 @@ fi #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive https://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-4.3.0.tar.bz2 + tar xf Nominatim-4.3.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://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: mkdir $USERHOME/build cd $USERHOME/build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-4.3.0 make sudo make install