From b30c9644bc3f5dfa62cac2fe729ca4b849d03bdb Mon Sep 17 00:00:00 2001 From: Rory& Date: Fri, 20 Dec 2024 15:23:24 +0100 Subject: [PATCH] fmt --- module.nix | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/module.nix b/module.nix index 82f6b0f..16578de 100644 --- a/module.nix +++ b/module.nix @@ -66,47 +66,47 @@ in } ); -script = pkgs.writeScript "matrix-ooye-pre-start.sh" '' - #!${lib.getExe pkgs.bash} - REGISTRATION_FILE=registration.yaml + script = pkgs.writeScript "matrix-ooye-pre-start.sh" '' + #!${lib.getExe pkgs.bash} + REGISTRATION_FILE=registration.yaml - id - echo "Before if statement" - stat ''${REGISTRATION_FILE} + id + echo "Before if statement" + stat ''${REGISTRATION_FILE} - if [[ ! -f ''${REGISTRATION_FILE} ]]; then - echo "No registration file found at '$REGISTRATION_FILE'" - cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} - fi - - echo "After if statement" - stat ''${REGISTRATION_FILE} + if [[ ! -f ''${REGISTRATION_FILE} ]]; then + echo "No registration file found at '$REGISTRATION_FILE'" + cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} + fi - AS_TOKEN=$(${lib.getExe pkgs.jq} -r .as_token ''${REGISTRATION_FILE}) - HS_TOKEN=$(${lib.getExe pkgs.jq} -r .hs_token ''${REGISTRATION_FILE}) - DISCORD_TOKEN=$(cat /run/credentials/matrix-ooye-pre-start.service/discord_token) + echo "After if statement" + stat ''${REGISTRATION_FILE} - if [[ -z "$AS_TOKEN" || "$AS_TOKEN" == "null" ]]; then - AS_TOKEN=$(${lib.getExe pkgs.openssl} rand -hex 64) - echo "Generated new AS token: ''${AS_TOKEN}" - fi - if [[ -z "$HS_TOKEN" || "$HS_TOKEN" == "null" ]]; then - HS_TOKEN=$(${lib.getExe pkgs.openssl} rand -hex 64) - echo "Generated new HS token: ''${HS_TOKEN}" - fi - if [[ -z "$DISCORD_TOKEN" ]]; then - echo "No Discord token found at '${cfg.discordTokenPath}'" - exit 1 - fi + AS_TOKEN=$(${lib.getExe pkgs.jq} -r .as_token ''${REGISTRATION_FILE}) + HS_TOKEN=$(${lib.getExe pkgs.jq} -r .hs_token ''${REGISTRATION_FILE}) + DISCORD_TOKEN=$(cat /run/credentials/matrix-ooye-pre-start.service/discord_token) - shred -u ''${REGISTRATION_FILE} - cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} + if [[ -z "$AS_TOKEN" || "$AS_TOKEN" == "null" ]]; then + AS_TOKEN=$(${lib.getExe pkgs.openssl} rand -hex 64) + echo "Generated new AS token: ''${AS_TOKEN}" + fi + if [[ -z "$HS_TOKEN" || "$HS_TOKEN" == "null" ]]; then + HS_TOKEN=$(${lib.getExe pkgs.openssl} rand -hex 64) + echo "Generated new HS token: ''${HS_TOKEN}" + fi + if [[ -z "$DISCORD_TOKEN" ]]; then + echo "No Discord token found at '${cfg.discordTokenPath}'" + exit 1 + fi - ${lib.getExe pkgs.jq} '.as_token = "'$AS_TOKEN'" | .hs_token = "'$HS_TOKEN'" | .ooye.discord_token = "'$DISCORD_TOKEN'"' ''${REGISTRATION_FILE} > ''${REGISTRATION_FILE}.tmp + shred -u ''${REGISTRATION_FILE} + cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} - shred -u ''${REGISTRATION_FILE} - mv ''${REGISTRATION_FILE}.tmp ''${REGISTRATION_FILE} -''; + ${lib.getExe pkgs.jq} '.as_token = "'$AS_TOKEN'" | .hs_token = "'$HS_TOKEN'" | .ooye.discord_token = "'$DISCORD_TOKEN'"' ''${REGISTRATION_FILE} > ''${REGISTRATION_FILE}.tmp + + shred -u ''${REGISTRATION_FILE} + mv ''${REGISTRATION_FILE}.tmp ''${REGISTRATION_FILE} + ''; in { @@ -163,7 +163,7 @@ script = pkgs.writeScript "matrix-ooye-pre-start.sh" '' DynamicUser = true; }; }; - + systemd.services."matrix-synapse".serviceConfig = lib.mkIf cfg.enableSynapseIntegration { LoadCredential = [ "matrix-ooye-registration:/var/lib/matrix-ooye/registration.yaml"