Skip to content
This repository has been archived by the owner on Feb 17, 2024. It is now read-only.

Commit

Permalink
remove matrix hookshot bot
Browse files Browse the repository at this point in the history
  • Loading branch information
FarisZR committed Oct 25, 2023
1 parent ed427fc commit b86ff57
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 235 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,29 +90,13 @@ jobs:
sed -i "s|(matrix_discord_as_token)|$MATRIX_DISCORD_AS_TOKEN|g" $GITHUB_WORKSPACE/matrix/mautrix-discord/config.yaml
sed -i "s|(matrix_discord_hs_token)|$MATRIX_DISCORD_HS_TOKEN|g" $GITHUB_WORKSPACE/matrix/mautrix-discord/config.yaml
- name: Add secrets to hookshot config files
env:
MATRIX_HOOKSHOT_AS_TOKEN: ${{ secrets.matrix_hookshot_as_token }}
MATRIX_HOOKSHOT_HS_TOKEN: ${{ secrets.matrix_hookshot_hs_token }}
MATRIX_HOOKSHOT_GITHUB_WEBHOOK_SECRET: ${{ secrets.matrix_hookshot_github_webhook_secret }}
MATRIX_HOOKSHOT_GITHUB_OAUTH_CLIENT_ID: ${{ secrets.matrix_hookshot_github_oauth_client_id }}
MATRIX_HOOKSHOT_GITHUB_OAUTH_CLIENT_SECRET: ${{ secrets.matrix_hookshot_github_oauth_client_secret }}
run: |
sed -i "s|(matrix_hookshot_as_token)|$MATRIX_HOOKSHOT_AS_TOKEN|g" $GITHUB_WORKSPACE/matrix/matrix-hookshot/app-service-registration.yaml
sed -i "s|(matrix_hookshot_hs_token)|$MATRIX_HOOKSHOT_HS_TOKEN|g" $GITHUB_WORKSPACE/matrix/matrix-hookshot/app-service-registration.yaml
sed -i "s|(matrix_hookshot_github_webhook_secret)|$MATRIX_HOOKSHOT_GITHUB_WEBHOOK_SECRET|g" $GITHUB_WORKSPACE/matrix/matrix-hookshot/config.yaml
sed -i "s|(matrix_hookshot_github_oauth_client_id)|$MATRIX_HOOKSHOT_GITHUB_OAUTH_CLIENT_ID|g" $GITHUB_WORKSPACE/matrix/matrix-hookshot/config.yaml
sed -i "s|(matrix_hookshot_github_oauth_client_secret)|$MATRIX_HOOKSHOT_GITHUB_OAUTH_CLIENT_SECRET|g" $GITHUB_WORKSPACE/matrix/matrix-hookshot/config.yaml
- name: Start Deployment
uses: FarisZR/[email protected]
env:
POSTGRES_PASSWORD: ${{ secrets.matrix_postgres_password }}
MATRIX_TELEGRAM_POSTGRES_PASSWORD: ${{ secrets.matrix_telegram_postgres_password }}
MATRIX_DISCORD_POSTGRES_PASSWORD: ${{ secrets.matrix_discord_postgres_password }}
MATRIX_SIGNING_KEY: ${{ secrets.matrix_signing_key }}
MATRIX_HOOKSHOT_GITHUB_PRIVATE_KEY: ${{ secrets.matrix_hookshot_github_private_key }}
MATRIX_HOOKSHOT_PASS_KEY: ${{ secrets.matrix_hookshot_pass_key }}
MATRIX_SLIDING_SYNC_POSTGRES_PASSWORD: ${{ secrets.MATRIX_SLIDING_SYNC_POSTGRES_PASSWORD }}
MATRIX_SLIDING_SYNC_POSTGRES_CONNECTION_STRING: ${{ secrets.MATRIX_SLIDING_SYNC_POSTGRES_CONNECTION_STRING }}
MATRIX_SLIDING_SYNC_SECRET: ${{ secrets.MATRIX_SLIDING_SYNC_SECRET }}
Expand Down
3 changes: 0 additions & 3 deletions caddy/configs/matrix.caddyfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
matrix.aosus.org {
reverse_proxy /hookshot/widgetapi/* matrix-hookshot:9002
reverse_proxy /hookshot/widgetapi matrix-hookshot:9002
reverse_proxy /hookshot/* matrix-hookshot:9000
# proxy direct images from discord CDN instead of uploading (https://docs.mau.fi/bridges/go/discord/direct-media.html)
handle /_matrix/media/*/download/aosus.org/discord_* {
header Access-Control-Allow-Origin *
Expand Down
35 changes: 0 additions & 35 deletions matrix/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ services:
target: /app-services/telegram.yaml
uid: "991"
gid: "991"
- source: matrix-hookshot-appservice
target: /app-services/hookshot.yml
uid: "991"
gid: "991"
- source: mautrix-discord-appservice
target: /app-services/discord.yaml
uid: "991"
Expand Down Expand Up @@ -119,28 +115,6 @@ services:
volumes:
- discord-postgres:/var/lib/postgresql/data:rw

matrix-hookshot:
image: halfshot/matrix-hookshot:4.5.1@sha256:ceed583cefbac8e3fe2f8bbde3cce459fd9e90f1e72536aa4967ed5f34b4c3ac
container_name: matrix-hookshot
restart: always
configs:
- source: matrix-hookshot-appservice
target: /data/registration.yml
- source: matrix-hookshot-config
target: /data/config.yml
secrets:
- source: matrix-hookshot-github-private-key
target: github-key.pem
- source: matrix-hookshot-pass-key
target: passkey.pem
expose:
- 9993 # Homeserver appservice port
- 9000 # Webhook port
- 9002 # widgets port
networks:
web:
default:


eturnal:
image: ghcr.io/processone/eturnal:1.12.0@sha256:c4ad43bc6a26d418455a0c89df9ce9850798c0a1401fc751ce43d831fd34e19b
Expand Down Expand Up @@ -197,21 +171,12 @@ configs:
file: /home/aosus/matrix/mautrix-discord/config.yaml
mautrix-discord-appservice:
file: /home/aosus/matrix/mautrix-discord/app-service-registration.yaml
matrix-hookshot-appservice:
file: /home/aosus/matrix/matrix-hookshot/app-service-registration.yaml
matrix-hookshot-config:
file: /home/aosus/matrix/matrix-hookshot/config.yaml
eturnal:
file: /home/aosus/matrix/eturnal.yml
# import secrets from environment variables set by the github runner
secrets:
matrix-signing-key:
environment: "MATRIX_SIGNING_KEY"
matrix-hookshot-github-private-key:
environment: "MATRIX_HOOKSHOT_GITHUB_PRIVATE_KEY"
matrix-hookshot-pass-key:
environment: "MATRIX_HOOKSHOT_PASS_KEY"

volumes:
caddy_data:
external: true
Expand Down
1 change: 0 additions & 1 deletion matrix/homeserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,6 @@ room_prejoin_state:
#
app_service_config_files:
- /app-services/telegram.yaml
- /app-services/hookshot.yml
- /app-services/discord.yaml

# Uncomment to enable tracking of application service IP addresses. Implicitly
Expand Down
20 changes: 0 additions & 20 deletions matrix/matrix-hookshot/app-service-registration.yaml

This file was deleted.

160 changes: 0 additions & 160 deletions matrix/matrix-hookshot/config.yaml

This file was deleted.

0 comments on commit b86ff57

Please sign in to comment.