Vagrant: use 2GB by default, dont overwrite local.php which would be unexpected

This commit is contained in:
marc tobias
2015-07-09 03:45:31 +02:00
parent 9b7d8db038
commit 3fe49072fe
3 changed files with 12 additions and 7 deletions

View File

@@ -38,7 +38,8 @@ is.
3. Import a small country (Monaco) 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. See the FAQ how to skip this step and point Nominatim to an existing database.
@@ -46,7 +47,7 @@ is.
# inside the virtual machine: # inside the virtual machine:
cd Nominatim cd Nominatim
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 | 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 ./utils/specialphrases.php --countries > data/specialphrases_countries.sql
psql -d nominatim -f data/specialphrases_countries.sql psql -d nominatim -f data/specialphrases_countries.sql
``` ```

2
Vagrantfile vendored
View File

@@ -30,7 +30,7 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |vb| config.vm.provider "virtualbox" do |vb|
vb.gui = false vb.gui = false
vb.customize ["modifyvm", :id, "--memory", "1024"] vb.customize ["modifyvm", :id, "--memory", "2048"]
end end

View File

@@ -84,8 +84,6 @@ sudo apt-get install -y libprotobuf-c0-dev protobuf-c-compiler \
# now ideally login as $USERNAME and continue # now ideally login as $USERNAME and continue
su $USERNAME -l su $USERNAME -l
pwd
ls -la /home/vagrant
cd /home/vagrant/Nominatim cd /home/vagrant/Nominatim
# cd ~/Nominatim # cd ~/Nominatim
@@ -96,6 +94,12 @@ chmod +x ./
chmod +x ./module 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=`curl -s http://bot.whatismyipaddress.com`
IP=localhost IP=localhost
echo "<?php echo "<?php
@@ -106,7 +110,7 @@ echo "<?php
@define('CONST_Postgis_Version', '2.1'); @define('CONST_Postgis_Version', '2.1');
// Website settings // Website settings
@define('CONST_Website_BaseURL', 'http://$IP:8089/nominatim/'); @define('CONST_Website_BaseURL', 'http://$IP:8089/nominatim/');
" > settings/local.php " > $LOCALSETTINGS_FILE
@@ -118,7 +122,7 @@ echo "<?php
### Setup Apache/website ### Setup Apache/website
### ###
createuser -SDR www-data sudo -u postgres createuser -SDR www-data
echo ' echo '
Listen 8089 Listen 8089