b3c5c99600
The main sticking point was `config/README.md`, which went into a lot of detail about each instance. It was quite easy to make a copy and paste error, as some instances had default URLs and others didn't, some had fallback instances and others didn't, etc. This changes a number of things: 1. `config/README.md` now has a table for the Redis instances with a single list of instructions that apply to all instances. 2. There are now specs to ensure that each Redis instance has a default URL set when no Redis config at all is present. 3. Instances that use a fallback instance for config will automatically use the default URL of their fallback instance. They should not define their own default URL. 4. The `.gitignore` file does not need to be updated for each new Redis instance. 5. The example config files are now gone as `request.yml.example` should be sufficient.
46 lines
1.4 KiB
Bash
46 lines
1.4 KiB
Bash
. scripts/utils.sh
|
|
|
|
export SETUP_DB=${SETUP_DB:-true}
|
|
export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true}
|
|
|
|
if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
|
|
bundle_install_script
|
|
fi
|
|
|
|
cp config/gitlab.yml.example config/gitlab.yml
|
|
sed -i 's/bin_path: \/usr\/bin\/git/bin_path: \/usr\/local\/bin\/git/' config/gitlab.yml
|
|
|
|
if [ "$DECOMPOSED_DB" == "true" ]; then
|
|
echo "Using decomposed database config (config/database.yml.decomposed-postgresql)"
|
|
cp config/database.yml.decomposed-postgresql config/database.yml
|
|
else
|
|
cp config/database.yml.postgresql config/database.yml
|
|
fi
|
|
|
|
if [ -f config/database_geo.yml.postgresql ]; then
|
|
cp config/database_geo.yml.postgresql config/database_geo.yml
|
|
fi
|
|
|
|
# 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/localhost/postgres/g' config/database.yml
|
|
sed -i 's/username: git/username: postgres/g' config/database.yml
|
|
|
|
if [ -f config/database_geo.yml ]; then
|
|
sed -i 's/localhost/postgres/g' config/database_geo.yml
|
|
sed -i 's/username: git/username: postgres/g' config/database_geo.yml
|
|
fi
|
|
|
|
cp config/cable.yml.example config/cable.yml
|
|
sed -i 's|url:.*$|url: redis://redis:6379|g' config/cable.yml
|
|
|
|
cp config/resque.yml.example config/resque.yml
|
|
sed -i 's|url:.*$|url: redis://redis:6379|g' config/resque.yml
|
|
|
|
if [ "$SETUP_DB" != "false" ]; then
|
|
setup_db
|
|
elif getent hosts postgres; then
|
|
setup_db_user_only
|
|
fi
|