andreas/mautrix-whatsapp-cloudron
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix yq syntax and logging directory issues

Browse Source
This commit is contained in:
Andreas Dueren
2025-06-16 11:52:31 -06:00
parent 8fa6d134ad
commit 4118b49738
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
start.sh
View File

@ -46,7 +46,7 @@ bridge:
logging:
handlers:
file:
filename: /app/data/logs/mautrix-whatsapp.log
filename: /app/data/mautrix-whatsapp.log
EOF
cat > "$REGISTRATION_PATH" << 'EOF'
id: whatsapp
@ -68,7 +68,7 @@ EOF
# Configure for Cloudron environment
if [ -n "${CLOUDRON_POSTGRESQL_URL:-}" ]; then
echo "=> Configuring PostgreSQL database"
yq eval ".database = \"$CLOUDRON_POSTGRESQL_URL\"" -i "$CONFIG_PATH"
yq -i ".appservice.database.uri = \"$CLOUDRON_POSTGRESQL_URL\"" "$CONFIG_PATH"
fi
if [ -n "${CLOUDRON_APP_DOMAIN:-}" ]; then
@ -76,17 +76,17 @@ EOF
BASE_DOMAIN=$(echo "$CLOUDRON_APP_DOMAIN" | cut -d. -f2-)
# Update homeserver configuration
yq eval ".homeserver.address = \"https://matrix.$BASE_DOMAIN\"" -i "$CONFIG_PATH"
yq eval ".homeserver.domain = \"$BASE_DOMAIN\"" -i "$CONFIG_PATH"
yq -i ".homeserver.address = \"https://matrix.$BASE_DOMAIN\"" "$CONFIG_PATH"
yq -i ".homeserver.domain = \"$BASE_DOMAIN\"" "$CONFIG_PATH"
# Update appservice configuration
yq eval ".appservice.address = \"https://$CLOUDRON_APP_DOMAIN\"" -i "$CONFIG_PATH"
yq eval ".appservice.hostname = \"0.0.0.0\"" -i "$CONFIG_PATH"
yq eval ".appservice.port = 29318" -i "$CONFIG_PATH"
yq -i ".appservice.address = \"https://$CLOUDRON_APP_DOMAIN\"" "$CONFIG_PATH"
yq -i ".appservice.hostname = \"0.0.0.0\"" "$CONFIG_PATH"
yq -i ".appservice.port = 29318" "$CONFIG_PATH"
fi
# Set log file path
yq eval ".logging.handlers.file.filename = \"/app/data/logs/mautrix-whatsapp.log\"" -i "$CONFIG_PATH"
yq -i ".logging.handlers.file.filename = \"/app/data/mautrix-whatsapp.log\"" "$CONFIG_PATH"
chown cloudron:cloudron "$CONFIG_PATH" "$REGISTRATION_PATH"
@ -108,8 +108,8 @@ chown -R cloudron:cloudron /app/data
# Configure TLS if certificates are available
if [ -f "/run/tls/tls.crt" ] && [ -f "/run/tls/tls.key" ]; then
echo "=> Configuring TLS certificates"
yq eval ".appservice.tls_cert = \"/run/tls/tls.crt\"" -i "$CONFIG_PATH"
yq eval ".appservice.tls_key = \"/run/tls/tls.key\"" -i "$CONFIG_PATH"
yq -i ".appservice.tls_cert = \"/run/tls/tls.crt\"" "$CONFIG_PATH"
yq -i ".appservice.tls_key = \"/run/tls/tls.key\"" "$CONFIG_PATH"
fi
# Start the bridge