This commit is contained in:
Rory& 2024-12-20 15:23:24 +01:00
commit b30c9644bc

View file

@ -66,47 +66,47 @@ in
} }
); );
script = pkgs.writeScript "matrix-ooye-pre-start.sh" '' script = pkgs.writeScript "matrix-ooye-pre-start.sh" ''
#!${lib.getExe pkgs.bash} #!${lib.getExe pkgs.bash}
REGISTRATION_FILE=registration.yaml REGISTRATION_FILE=registration.yaml
id id
echo "Before if statement" echo "Before if statement"
stat ''${REGISTRATION_FILE} stat ''${REGISTRATION_FILE}
if [[ ! -f ''${REGISTRATION_FILE} ]]; then if [[ ! -f ''${REGISTRATION_FILE} ]]; then
echo "No registration file found at '$REGISTRATION_FILE'" echo "No registration file found at '$REGISTRATION_FILE'"
cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE}
fi fi
echo "After if statement"
stat ''${REGISTRATION_FILE}
AS_TOKEN=$(${lib.getExe pkgs.jq} -r .as_token ''${REGISTRATION_FILE}) echo "After if statement"
HS_TOKEN=$(${lib.getExe pkgs.jq} -r .hs_token ''${REGISTRATION_FILE}) stat ''${REGISTRATION_FILE}
DISCORD_TOKEN=$(cat /run/credentials/matrix-ooye-pre-start.service/discord_token)
if [[ -z "$AS_TOKEN" || "$AS_TOKEN" == "null" ]]; then AS_TOKEN=$(${lib.getExe pkgs.jq} -r .as_token ''${REGISTRATION_FILE})
AS_TOKEN=$(${lib.getExe pkgs.openssl} rand -hex 64) HS_TOKEN=$(${lib.getExe pkgs.jq} -r .hs_token ''${REGISTRATION_FILE})
echo "Generated new AS token: ''${AS_TOKEN}" DISCORD_TOKEN=$(cat /run/credentials/matrix-ooye-pre-start.service/discord_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
shred -u ''${REGISTRATION_FILE} if [[ -z "$AS_TOKEN" || "$AS_TOKEN" == "null" ]]; then
cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} 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} ${lib.getExe pkgs.jq} '.as_token = "'$AS_TOKEN'" | .hs_token = "'$HS_TOKEN'" | .ooye.discord_token = "'$DISCORD_TOKEN'"' ''${REGISTRATION_FILE} > ''${REGISTRATION_FILE}.tmp
mv ''${REGISTRATION_FILE}.tmp ''${REGISTRATION_FILE}
''; shred -u ''${REGISTRATION_FILE}
mv ''${REGISTRATION_FILE}.tmp ''${REGISTRATION_FILE}
'';
in in
{ {
@ -163,7 +163,7 @@ script = pkgs.writeScript "matrix-ooye-pre-start.sh" ''
DynamicUser = true; DynamicUser = true;
}; };
}; };
systemd.services."matrix-synapse".serviceConfig = lib.mkIf cfg.enableSynapseIntegration { systemd.services."matrix-synapse".serviceConfig = lib.mkIf cfg.enableSynapseIntegration {
LoadCredential = [ LoadCredential = [
"matrix-ooye-registration:/var/lib/matrix-ooye/registration.yaml" "matrix-ooye-registration:/var/lib/matrix-ooye/registration.yaml"