Patch by Benjamin Drung
Use 'set -e' to let the script fail when any command fails. This allows us to remove the "command || exit 1" constructs.
This commit is contained in:
parent
e7430db19d
commit
418b1b81b1
1 changed files with 5 additions and 12 deletions
17
debian/grantpriv.sh
vendored
17
debian/grantpriv.sh
vendored
|
@ -1,4 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
dbname=gitlab_production
|
dbname=gitlab_production
|
||||||
|
|
||||||
|
@ -10,23 +11,15 @@ test -n "${gitlab_user:-}" || gitlab_user="gitlab"
|
||||||
if ! su ${gitlab_user} -c 'psql gitlab_production -c ""'
|
if ! su ${gitlab_user} -c 'psql gitlab_production -c ""'
|
||||||
then
|
then
|
||||||
echo "Create ${gitlab_user} user with create database privillege..."
|
echo "Create ${gitlab_user} user with create database privillege..."
|
||||||
su postgres -c "psql -c \"CREATE USER ${gitlab_user} CREATEDB;\"" || {
|
su postgres -c "psql -c \"CREATE USER ${gitlab_user} CREATEDB;\""
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# By default the gitlab_prodcution is not owned by gitlab user
|
# By default the gitlab_prodcution is not owned by gitlab user
|
||||||
echo "Make ${gitlab_user} user owner of $dbname database..."
|
echo "Make ${gitlab_user} user owner of $dbname database..."
|
||||||
su postgres -c "psql -c \"ALTER DATABASE $dbname OWNER to ${gitlab_user};\"" || {
|
su postgres -c "psql -c \"ALTER DATABASE $dbname OWNER to ${gitlab_user};\""
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
echo "Grant all privileges to ${gitlab_user} user..."
|
echo "Grant all privileges to ${gitlab_user} user..."
|
||||||
su postgres -c "psql -c \"GRANT ALL PRIVILEGES ON DATABASE template1 to ${gitlab_user};\"" || {
|
su postgres -c "psql -c \"GRANT ALL PRIVILEGES ON DATABASE template1 to ${gitlab_user};\""
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# enable the pg_trgm extension
|
# enable the pg_trgm extension
|
||||||
su postgres -c "psql -d $dbname -c \"CREATE EXTENSION IF NOT EXISTS pg_trgm;\"" || {
|
su postgres -c "psql -d $dbname -c \"CREATE EXTENSION IF NOT EXISTS pg_trgm;\""
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue