safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Merge pull request #776 from lonvia/vagrant-fix-country-paths

Browse Source 
vagrant: download country data into correct directory
This commit is contained in:
Sarah Hoffmann
2017-07-26 23:44:00 +02:00
committed by GitHub
parent 9996cc495c 937bead547
commit 96ecee431b
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
VAGRANT.md
View File

@@ -47,7 +47,6 @@ is.
# inside the virtual machine: # inside the virtual machine:
mkdir data mkdir data
cd build cd build
wget -O /home/vagrant/Nominatim/data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
``` ```

5
vagrant/Install-on-Centos-7.sh
View File

@@ -145,10 +145,10 @@ if [ "x$1" == "xyes" ]; then #DOCS:
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/openstreetmap/Nominatim.git git clone --recursive git://github.com/openstreetmap/Nominatim.git
#DOCS: cd Nominatim cd Nominatim
else #DOCS: else #DOCS:
cd $USERHOME #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #DOCS: fi #DOCS:
# When installing the latest source from github, you also need to # When installing the latest source from github, you also need to
@@ -161,6 +161,7 @@ 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,
# then configure and build Nominatim in there: # then configure and build Nominatim in there:
cd $USERHOME #DOCS:
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim cmake $USERHOME/Nominatim

5
vagrant/Install-on-Ubuntu-16.sh
View File

@@ -132,10 +132,10 @@ if [ "x$1" == "xyes" ]; then #DOCS:
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/openstreetmap/Nominatim.git git clone --recursive git://github.com/openstreetmap/Nominatim.git
#DOCS: cd Nominatim cd Nominatim
else #DOCS: else #DOCS:
cd $USERHOME #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #DOCS: fi #DOCS:
# When installing the latest source from github, you also need to # When installing the latest source from github, you also need to
@@ -148,6 +148,7 @@ 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,
# then configure and build Nominatim in there: # then configure and build Nominatim in there:
cd $USERHOME #DOCS:
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim cmake $USERHOME/Nominatim

2
vagrant/install-on-travis-ci.sh
View File

@@ -45,7 +45,7 @@ EOFAPACHECONF
sudo a2enconf nominatim sudo a2enconf nominatim
sudo service apache2 restart sudo service apache2 restart
wget -O 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 http://www.nominatim.org/data/country_grid.sql.gz
mkdir build mkdir build
cd build cd build