From 2cf1ff41c02729156821afbb6170243b8fd79422 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 10 Jan 2018 23:21:21 +0100 Subject: [PATCH] move nominatim.org links to https Solves #737. --- docs/Faq.md | 2 +- docs/Import-and-Update.md | 6 +++--- docs/Install-on-Centos-7.md | 2 +- docs/Install-on-Ubuntu-16.md | 2 +- test/README.md | 4 ++-- utils/setup.php | 2 +- vagrant/Install-on-Centos-7.sh | 2 +- vagrant/Install-on-Ubuntu-16.sh | 2 +- vagrant/install-on-travis-ci.sh | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/Faq.md b/docs/Faq.md index ace6537b..ed26f7b8 100644 --- a/docs/Faq.md +++ b/docs/Faq.md @@ -40,7 +40,7 @@ then you can resume with the following command: ./utils/setup.php --index --create-search-indices --create-country-names -If the reported rank is 26 or higher, you can also safely add `-index-noanalyse`. +If the reported rank is 26 or higher, you can also safely add `--index-noanalyse`. ### When running the setup.php script I get a warning: diff --git a/docs/Import-and-Update.md b/docs/Import-and-Update.md index ec451e8f..d99c878c 100644 --- a/docs/Import-and-Update.md +++ b/docs/Import-and-Update.md @@ -33,8 +33,8 @@ but it will improve the quality of the results if this is installed. This data is available as a binary download: cd $NOMINATIM_SOURCE_DIR/data - wget http://www.nominatim.org/data/wikipedia_article.sql.bin - wget http://www.nominatim.org/data/wikipedia_redirect.sql.bin + wget https://www.nominatim.org/data/wikipedia_article.sql.bin + wget https://www.nominatim.org/data/wikipedia_redirect.sql.bin Combined the 2 files are around 1.5GB and add around 30GB to the install size of nominatim. They also increase the install time by an hour or so. @@ -48,7 +48,7 @@ loaded data. Nominatim can use postcodes from an external source to improve searches that involve a UK postcode. This data can be optionally downloaded: cd $NOMINATIM_SOURCE_DIR/data - wget http://www.nominatim.org/data/gb_postcode_data.sql.gz + wget https://www.nominatim.org/data/gb_postcode_data.sql.gz Initial import of the data diff --git a/docs/Install-on-Centos-7.md b/docs/Install-on-Centos-7.md index 5156fa02..0ac1e53b 100644 --- a/docs/Install-on-Centos-7.md +++ b/docs/Install-on-Centos-7.md @@ -154,7 +154,7 @@ When installing the latest source from github, you also need to download the country grid: - wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz + wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz The code must be built in a separate directory. Create this directory, diff --git a/docs/Install-on-Ubuntu-16.md b/docs/Install-on-Ubuntu-16.md index 849e00b9..de84f556 100644 --- a/docs/Install-on-Ubuntu-16.md +++ b/docs/Install-on-Ubuntu-16.md @@ -142,7 +142,7 @@ When installing the latest source from github, you also need to download the country grid: - wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz + wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz The code must be built in a separate directory. Create this directory, diff --git a/test/README.md b/test/README.md index 87782653..2a357e40 100644 --- a/test/README.md +++ b/test/README.md @@ -100,7 +100,7 @@ be documented. These tests are meant to test the different API endpoints and their parameters. They require a preimported test database, which consists of the import of a planet extract. A precompiled PBF with the necessary data can be downloaded from -http://www.nominatim.org/data/test/nominatim-api-testdata.pbf +https://www.nominatim.org/data/test/nominatim-api-testdata.pbf The polygons defining the extract can be found in the test/testdb directory. There is also a reduced set of wikipedia data for this extract, @@ -112,7 +112,7 @@ planets are likely to work as well but you may see isolated test failures where the data has changed. To recreate the input data for the test database run: - wget http://free.nchc.org.tw/osm.planet/pbf/planet-160725.osm.pbf + wget https://free.nchc.org.tw/osm.planet/pbf/planet-160725.osm.pbf osmconvert planet-160725.osm.pbf -B=test/testdb/testdb.polys -o=testdb.pbf Before importing make sure to add the following to your local settings: diff --git a/utils/setup.php b/utils/setup.php index b93e4f82..53778b1c 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -152,7 +152,7 @@ if ($aCMDResult['setup-db'] || $aCMDResult['all']) { if (!file_exists(CONST_ExtraDataPath.'/country_osm_grid.sql.gz')) { echo 'Error: you need to download the country_osm_grid first:'; - echo "\n wget -O ".CONST_ExtraDataPath."/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz\n"; + echo "\n wget -O ".CONST_ExtraDataPath."/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz\n"; exit(1); } diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh index 36d3ea4a..6c41b70c 100755 --- a/vagrant/Install-on-Centos-7.sh +++ b/vagrant/Install-on-Centos-7.sh @@ -155,7 +155,7 @@ fi #DOCS: # download the country grid: if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: - wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz + 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, diff --git a/vagrant/Install-on-Ubuntu-16.sh b/vagrant/Install-on-Ubuntu-16.sh index 9c58d063..aee7a3bf 100755 --- a/vagrant/Install-on-Ubuntu-16.sh +++ b/vagrant/Install-on-Ubuntu-16.sh @@ -143,7 +143,7 @@ fi #DOCS: # download the country grid: if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: - wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz + 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, diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh index 98357185..f156ea45 100755 --- a/vagrant/install-on-travis-ci.sh +++ b/vagrant/install-on-travis-ci.sh @@ -45,7 +45,7 @@ EOFAPACHECONF sudo a2enconf nominatim sudo service apache2 restart -wget -O $TRAVIS_BUILD_DIR/data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz +wget -O $TRAVIS_BUILD_DIR/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz mkdir build cd build