@@ -168,9 +168,10 @@ in
168168 type = lib.types.str;
169169 default = "keycloak";
170170 description = ''
171− Username to use when connecting to an external or manually
172− provisioned database; has no effect when a local database is
173− automatically provisioned.
171+ Username to use when connecting to the database.
172+ This is also used for automatic provisioning of the database.
173+ Changing this after the initial installation doesn't delete the
174+ old user and can cause further problems.
174175 '';
175176 };
176177
@@ -587,8 +588,8 @@ in
587588 PSQL=${config.services.postgresql.package}/bin/psql
588589
589590 db_password="$(<'${cfg.databasePasswordFile}')"
590− $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || $PSQL -tAc "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB"
591− $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
591+ $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${cfg.databaseUsername}'" | grep -q 1 || $PSQL -tAc "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN PASSWORD '$db_password' CREATEDB"
592+ $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "${cfg.databaseUsername}"'
592593 '';
593594 };
594595
@@ -606,9 +607,9 @@ in
606607 set -eu
607608
608609 db_password="$(<'${cfg.databasePasswordFile}')"
609− ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
610+ ( echo "CREATE USER IF NOT EXISTS '${cfg.databaseUsername}'@'localhost' IDENTIFIED BY '$db_password';"
610611 echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
611− echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';"
612+ echo "GRANT ALL PRIVILEGES ON keycloak.* TO '${cfg.databaseUsername}'@'localhost';"
612613 ) | ${config.services.mysql.package}/bin/mysql -N
613614 '';
614615 };