Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

This commit is contained in:
Martin Edenhofer 2017-06-06 14:11:58 +02:00
commit 278e90fc63

View file

@ -140,12 +140,12 @@ function create_postgresql_db () {
echo "# Restarting postgresql server" echo "# Restarting postgresql server"
${INIT_CMD} restart postgresql ${INIT_CMD} restart postgresql
echo "# Creating zammad postgresql db"
su - postgres -c "createdb -E UTF8 ${DB}"
echo "# Creating zammad postgresql user" echo "# Creating zammad postgresql user"
echo "CREATE USER \"${DB_USER}\" WITH PASSWORD '${DB_PASS}';" | su - postgres -c psql echo "CREATE USER \"${DB_USER}\" WITH PASSWORD '${DB_PASS}';" | su - postgres -c psql
echo "# Creating zammad postgresql db"
su - postgres -c "createdb -E UTF8 ${DB} -O ${DB_USER}"
echo "# Grant privileges to new postgresql user" echo "# Grant privileges to new postgresql user"
echo "GRANT ALL PRIVILEGES ON DATABASE \"${DB}\" TO \"${DB_USER}\";" | su - postgres -c psql echo "GRANT ALL PRIVILEGES ON DATABASE \"${DB}\" TO \"${DB_USER}\";" | su - postgres -c psql
} }