From 3fe49072feeb377da26bd488d3fc62aee9fadf56 Mon Sep 17 00:00:00 2001 From: marc tobias Date: Thu, 9 Jul 2015 03:45:31 +0200 Subject: [PATCH] Vagrant: use 2GB by default, dont overwrite local.php which would be unexpected --- VAGRANT.md | 5 +++-- Vagrantfile | 2 +- vagrant-provision.sh | 12 ++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/VAGRANT.md b/VAGRANT.md index d97fb3f7..c662d5e4 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -38,7 +38,8 @@ is. 3. Import a small country (Monaco) - You need to give the virtual machine more memory (2GB) for an import, see `Vagrantfile`. + You need to give the virtual machine more memory (2GB) for an import, + see `Vagrantfile`. Otherwise 1GB is enough. See the FAQ how to skip this step and point Nominatim to an existing database. @@ -46,7 +47,7 @@ is. # inside the virtual machine: cd Nominatim 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 | tee monaco.$$.log + ./utils/setup.php --osm-file data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log ./utils/specialphrases.php --countries > data/specialphrases_countries.sql psql -d nominatim -f data/specialphrases_countries.sql ``` diff --git a/Vagrantfile b/Vagrantfile index 1b165327..843dd668 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -30,7 +30,7 @@ Vagrant.configure("2") do |config| config.vm.provider "virtualbox" do |vb| vb.gui = false - vb.customize ["modifyvm", :id, "--memory", "1024"] + vb.customize ["modifyvm", :id, "--memory", "2048"] end diff --git a/vagrant-provision.sh b/vagrant-provision.sh index aad75443..68e279c5 100755 --- a/vagrant-provision.sh +++ b/vagrant-provision.sh @@ -84,8 +84,6 @@ sudo apt-get install -y libprotobuf-c0-dev protobuf-c-compiler \ # now ideally login as $USERNAME and continue su $USERNAME -l -pwd -ls -la /home/vagrant cd /home/vagrant/Nominatim # cd ~/Nominatim @@ -96,6 +94,12 @@ chmod +x ./ chmod +x ./module +LOCALSETTINGS_FILE='settings/local.php' +if [[ -e "$LOCALSETTINGS_FILE" ]]; then + echo "$LOCALSETTINGS_FILE already exist, writing to settings/local-vagrant.php instead." + LOCALSETTINGS_FILE='settings/local-vagrant.php' +fi + # IP=`curl -s http://bot.whatismyipaddress.com` IP=localhost echo " settings/local.php +" > $LOCALSETTINGS_FILE @@ -118,7 +122,7 @@ echo "