@@ -537,7 +537,9 @@ in
537537
538538 jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig');
539539
540− keycloakConfig = pkgs.runCommandNoCC "keycloak-config" {} ''
540+ keycloakConfig = pkgs.runCommandNoCC "keycloak-config" {
541+ nativeBuildInputs = [ cfg.package ];
542+ } ''
541543 export JBOSS_BASE_DIR="$(pwd -P)";
542544 export JBOSS_MODULEPATH="${cfg.package}/modules";
543545 export JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log";
@@ -547,11 +549,11 @@ in
547549
548550 mkdir -p {deployments,ssl}
549551
550− "${cfg.package}/bin/standalone.sh"&
552+ standalone.sh&
551553
552554 attempt=1
553555 max_attempts=30
554− while ! ${cfg.package}/bin/jboss-cli.sh --connect ':read-attribute(name=server-state)'; do
556+ while ! jboss-cli.sh --connect ':read-attribute(name=server-state)'; do
555557 if [[ "$attempt" == "$max_attempts" ]]; then
556558 echo "ERROR: Could not connect to Keycloak after $attempt attempts! Failing.." >&2
557559 exit 1
@@ -561,7 +563,7 @@ in
561563 (( attempt++ ))
562564 done
563565
564− ${cfg.package}/bin/jboss-cli.sh --connect --file=${jbossCliScript} --echo-command
566+ jboss-cli.sh --connect --file=${jbossCliScript} --echo-command
565567
566568 cp configuration/standalone.xml $out
567569 '';
@@ -581,6 +583,7 @@ in
581583 after = [ "postgresql.service" ];
582584 before = [ "keycloak.service" ];
583585 bindsTo = [ "postgresql.service" ];
586+ path = [ config.services.postgresql.package ];
584587 serviceConfig = {
585588 Type = "oneshot";
586589 RemainAfterExit = true;
@@ -591,14 +594,12 @@ in
591594 set -o errexit -o pipefail -o nounset -o errtrace
592595 shopt -s inherit_errexit
593596
594− PSQL=${config.services.postgresql.package}/bin/psql
595−
596597 create_role="$(mktemp)"
597598 trap 'rm -f "$create_role"' ERR EXIT
598599
599600 echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$(<'${cfg.databasePasswordFile}')' CREATEDB" > "$create_role"
600− $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || $PSQL -tA --file="$create_role"
601− $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
601+ psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role"
602+ psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
602603 '';
603604 };
604605
@@ -606,6 +607,7 @@ in
606607 after = [ "mysql.service" ];
607608 before = [ "keycloak.service" ];
608609 bindsTo = [ "mysql.service" ];
610+ path = [ config.services.mysql.package ];
609611 serviceConfig = {
610612 Type = "oneshot";
611613 RemainAfterExit = true;
@@ -620,7 +622,7 @@ in
620622 ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
621623 echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
622624 echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';"
623− ) | ${config.services.mysql.package}/bin/mysql -N
625+ ) | mysql -N
624626 '';
625627 };
626628
@@ -639,6 +641,8 @@ in
639641 bindsTo = databaseServices;
640642 wantedBy = [ "multi-user.target" ];
641643 path = with pkgs; [
644+ cfg.package
645+ openssl
642646 replace-secret
643647 ];
644648 environment = {
@@ -670,13 +674,13 @@ in
670674 replace-secret '@db-password@' '/run/keycloak/secrets/db_password' /run/keycloak/configuration/standalone.xml
671675
672676 export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration
673− ${cfg.package}/bin/add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}'
677+ add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}'
674678 '' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) ''
675679 pushd /run/keycloak/ssl/
676680 cat /run/keycloak/secrets/ssl_cert_pk_bundle <(echo) /etc/ssl/certs/ca-certificates.crt > allcerts.pem
677− ${pkgs.openssl}/bin/openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert_pk_bundle -chain \
678− -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \
679− -CAfile allcerts.pem -passout pass:notsosecretpassword
681+ openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert_pk_bundle -chain \
682+ -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \
683+ -CAfile allcerts.pem -passout pass:notsosecretpassword
680684 popd
681685 '';
682686 in [