summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2017-12-29 08:59:47 +0100
committerYorhel <git@yorhel.nl>2017-12-29 09:00:15 +0100
commitdc15b3f21c4004c2ede86de853eb28f218b7090e (patch)
treed95b471ba0af5c41090cd78f99033e5eda8b0344 /util
parent56c6772aa792122931f415c3049491c685f678a4 (diff)
Experimenting with PostgreSQL 10: "UNENCRYPTED" keyword has been removed
Diffstat (limited to 'util')
-rwxr-xr-xutil/docker-init.sh6
-rw-r--r--util/sql/superuser_init.sql2
2 files changed, 4 insertions, 4 deletions
diff --git a/util/docker-init.sh b/util/docker-init.sh
index f815c7f8..8458ef26 100755
--- a/util/docker-init.sh
+++ b/util/docker-init.sh
@@ -50,9 +50,9 @@ pg_init() {
# Should run as the postgres user
pg_load_superuser() {
psql -f /var/www/util/sql/superuser_init.sql
- echo "ALTER ROLE vndb LOGIN UNENCRYPTED PASSWORD 'vndb'" | psql -U postgres
- echo "ALTER ROLE vndb_site LOGIN UNENCRYPTED PASSWORD 'vndb_site'" | psql -U postgres
- echo "ALTER ROLE vndb_multi LOGIN UNENCRYPTED PASSWORD 'vndb_multi'" | psql -U postgres
+ echo "ALTER ROLE vndb LOGIN PASSWORD 'vndb'" | psql -U postgres
+ echo "ALTER ROLE vndb_site LOGIN PASSWORD 'vndb_site'" | psql -U postgres
+ echo "ALTER ROLE vndb_multi LOGIN PASSWORD 'vndb_multi'" | psql -U postgres
}
# Should run as devuser
diff --git a/util/sql/superuser_init.sql b/util/sql/superuser_init.sql
index 1a2602cd..6e94167c 100644
--- a/util/sql/superuser_init.sql
+++ b/util/sql/superuser_init.sql
@@ -4,7 +4,7 @@
-- In order to "activate" a user, i.e. to allow login, you need to manually run
-- the following for each user you want to activate:
--- ALTER ROLE rolename LOGIN UNENCRYPTED PASSWORD 'password';
+-- ALTER ROLE rolename LOGIN PASSWORD 'password';
CREATE ROLE vndb;
CREATE DATABASE vndb OWNER vndb;