Commit 35c69ea2 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rs-prepare-build-parity' into 'master'

CE-EE parity for prepare_build script

See merge request gitlab-org/gitlab-ce!23819
parents c40d9796 a183aa3c
...@@ -27,13 +27,25 @@ fi ...@@ -27,13 +27,25 @@ fi
cp config/database.yml.$GITLAB_DATABASE config/database.yml cp config/database.yml.$GITLAB_DATABASE config/database.yml
if [ -f config/database_geo.yml.$GITLAB_DATABASE ]; then
cp config/database_geo.yml.$GITLAB_DATABASE config/database_geo.yml
fi
# Set user to a non-superuser to ensure we test permissions # Set user to a non-superuser to ensure we test permissions
sed -i 's/username: root/username: gitlab/g' config/database.yml sed -i 's/username: root/username: gitlab/g' config/database.yml
if [ "$GITLAB_DATABASE" = 'postgresql' ]; then if [ "$GITLAB_DATABASE" = 'postgresql' ]; then
sed -i 's/localhost/postgres/g' config/database.yml sed -i 's/localhost/postgres/g' config/database.yml
if [ -f config/database_geo.yml ]; then
sed -i 's/localhost/postgres/g' config/database_geo.yml
fi
else # Assume it's mysql else # Assume it's mysql
sed -i 's/localhost/mysql/g' config/database.yml sed -i 's/localhost/mysql/g' config/database.yml
if [ -f config/database_geo.yml ]; then
sed -i 's/localhost/mysql/g' config/database_geo.yml
fi
fi fi
cp config/resque.yml.example config/resque.yml cp config/resque.yml.example config/resque.yml
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment