move nominatim.org links to https

Solves #737.
This commit is contained in:
Sarah Hoffmann 2018-01-10 23:21:21 +01:00
parent 118517b076
commit 2cf1ff41c0
9 changed files with 12 additions and 12 deletions

View File

@ -40,7 +40,7 @@ then you can resume with the following command:
./utils/setup.php --index --create-search-indices --create-country-names ./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: ### When running the setup.php script I get a warning:

View File

@ -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: This data is available as a binary download:
cd $NOMINATIM_SOURCE_DIR/data cd $NOMINATIM_SOURCE_DIR/data
wget http://www.nominatim.org/data/wikipedia_article.sql.bin wget https://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_redirect.sql.bin
Combined the 2 files are around 1.5GB and add around 30GB to the install 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. 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: 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 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 Initial import of the data

View File

@ -154,7 +154,7 @@ When installing the latest source from github, you also need to
download the country grid: 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, The code must be built in a separate directory. Create this directory,

View File

@ -142,7 +142,7 @@ When installing the latest source from github, you also need to
download the country grid: 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, The code must be built in a separate directory. Create this directory,

View File

@ -100,7 +100,7 @@ be documented.
These tests are meant to test the different API endpoints and their parameters. 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 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 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 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, 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 failures where the data has changed. To recreate the input data
for the test database run: 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 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: Before importing make sure to add the following to your local settings:

View File

@ -152,7 +152,7 @@ if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
if (!file_exists(CONST_ExtraDataPath.'/country_osm_grid.sql.gz')) { if (!file_exists(CONST_ExtraDataPath.'/country_osm_grid.sql.gz')) {
echo 'Error: you need to download the country_osm_grid first:'; 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); exit(1);
} }

View File

@ -155,7 +155,7 @@ fi #DOCS:
# download the country grid: # download the country grid:
if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: 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: 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,

View File

@ -143,7 +143,7 @@ fi #DOCS:
# download the country grid: # download the country grid:
if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: 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: 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,

View File

@ -45,7 +45,7 @@ EOFAPACHECONF
sudo a2enconf nominatim sudo a2enconf nominatim
sudo service apache2 restart 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 mkdir build
cd build cd build