···88Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions
99-->
10101111-###### Motivation for this change
1111+###### Description of changes
12121313+<!--
1414+For package updates please link to a changelog or describe changes, this helps your fellow maintainers discover breaking updates.
1515+For new packages please briefly describe the package or provide a link to its homepage.
1616+-->
13171418###### Things done
1519
+6-4
nixos/modules/services/web-apps/keycloak.nix
···693693 RemainAfterExit = true;
694694 User = "postgres";
695695 Group = "postgres";
696696+ LoadCredential = [ "db_password:${cfg.database.passwordFile}" ];
696697 };
697698 script = ''
698699 set -o errexit -o pipefail -o nounset -o errtrace
···701702 create_role="$(mktemp)"
702703 trap 'rm -f "$create_role"' ERR EXIT
703704704704- echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$(<'${cfg.database.passwordFile}')' CREATEDB" > "$create_role"
705705+ db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
706706+ echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role"
705707 psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role"
706708 psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
707709 '';
···717719 RemainAfterExit = true;
718720 User = config.services.mysql.user;
719721 Group = config.services.mysql.group;
722722+ LoadCredential = [ "db_password:${cfg.database.passwordFile}" ];
720723 };
721724 script = ''
722725 set -o errexit -o pipefail -o nounset -o errtrace
723726 shopt -s inherit_errexit
724724-725725- db_password="$(<'${cfg.database.passwordFile}')"
727727+ db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
726728 ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
727727- echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
729729+ echo "CREATE DATABASE IF NOT EXISTS keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
728730 echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';"
729731 ) | mysql -N
730732 '';
···9999 python-subunit = subunit; # added 2021-09-10
100100 pytest_xdist = pytest-xdist; # added 2021-01-04
101101 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
102102+ pytwitchapi = twitchapi; # added 2022-03-07
102103 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
103104 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
104105 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05