Merge branch 'pull/3692'

[rails.git] / docker / postgres / openstreetmap-postgres-init.sh

diff --git a/docker/postgres/openstreetmap-postgres-init.sh b/docker/postgres/openstreetmap-postgres-init.sh
index 3973311c12e85f8fb27a9d3b4cd585e0e2476453..1a7c58857c9553b17ee76832a8d82b67ebe93bee 100755 (executable)
--- a/docker/postgres/openstreetmap-postgres-init.sh
+++ b/docker/postgres/openstreetmap-postgres-init.sh
@@ -2,6 +2,7 @@
 set -ex
 
 # Create 'openstreetmap' user
 set -ex
 
 # Create 'openstreetmap' user

+# Password and superuser privilege are needed to successfully run test suite

 psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" <<-EOSQL
     CREATE USER openstreetmap SUPERUSER PASSWORD 'openstreetmap';
     GRANT ALL PRIVILEGES ON DATABASE openstreetmap TO openstreetmap;
 psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" <<-EOSQL
     CREATE USER openstreetmap SUPERUSER PASSWORD 'openstreetmap';
     GRANT ALL PRIVILEGES ON DATABASE openstreetmap TO openstreetmap;


@@ -11,4 +12,4 @@ EOSQL
 psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -c "CREATE EXTENSION btree_gist" openstreetmap
 
 # Define custom functions
 psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -c "CREATE EXTENSION btree_gist" openstreetmap
 
 # Define custom functions

-psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -f "/usr/local/sbin/osm-db-functions.sql" openstreetmap
+psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -f "/usr/local/share/osm-db-functions.sql" openstreetmap