Merge remote-tracking branch 'upstream/pull/3455'

[rails.git] / script / vagrant / setup / provision.sh

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index e2cacfff360751ef9c39262085f8d62949848475..6d7e51d6a0527b91f697c2a52d0849b42c5482cc 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -53,7 +53,6 @@ sudo -u vagrant psql -d openstreetmap -f db/functions/functions.sql
 #pushd db/functions
 #sudo -u vagrant make
 #sudo -u vagrant psql openstreetmap -c "CREATE OR REPLACE FUNCTION tile_for_point(int4, int4) RETURNS int8 AS '/srv/openstreetmap-website/db/functions/libpgosm.so', 'tile_for_point' LANGUAGE C STRICT"
-#sudo -u vagrant psql openstreetmap -c "CREATE OR REPLACE FUNCTION xid_to_int4(xid) RETURNS int4 AS '/srv/openstreetmap-website/db/functions/libpgosm.so', 'xid_to_int4' LANGUAGE C STRICT"
 #popd
 
 
@@ -61,6 +60,9 @@ sudo -u vagrant psql -d openstreetmap -f db/functions/functions.sql
 if [ ! -f config/database.yml ]; then
     sudo -u vagrant cp config/example.database.yml config/database.yml
 fi
+if [ ! -f config/storage.yml ]; then
+    cp config/example.storage.yml config/storage.yml
+fi
 touch config/settings.local.yml
 # migrate the database to the latest version
 sudo -u vagrant bundle exec rake db:migrate