From 11937ee70ab7b1f86f2d8551663d09b9f385828e Mon Sep 17 00:00:00 2001 From: gruberdev Date: Mon, 31 Oct 2022 17:24:06 -0300 Subject: [PATCH] [fix/matrix] Fixed DB resources and WP Bridge --- apps/data/storage/base/postgres/bridges.yaml | 12 + apps/data/storage/kustomization.yaml | 1 + apps/home/ha/base/db.yaml | 7 - apps/matrix/Dockerfile | 5 + apps/matrix/bridges/telegram/README.md | 1 + apps/matrix/bridges/whatsapp/Dockerfile | 4 - apps/matrix/bridges/whatsapp/cm.yaml | 555 +++++------------- apps/matrix/bridges/whatsapp/deployment.yaml | 10 +- .../bridges/whatsapp/kustomization.yaml | 2 +- apps/matrix/databases/base/bridges.yaml | 49 ++ apps/matrix/databases/base/kustomization.yaml | 4 +- apps/matrix/databases/base/synapse-redis.yaml | 42 ++ apps/matrix/databases/base/synapse.yaml | 36 ++ apps/matrix/databases/base/whatsapp.yaml | 27 - apps/services/n8n/base/db.yaml | 7 - tasks/matrix.yaml | 18 +- 16 files changed, 311 insertions(+), 469 deletions(-) create mode 100644 apps/data/storage/base/postgres/bridges.yaml create mode 100644 apps/matrix/Dockerfile create mode 100644 apps/matrix/bridges/telegram/README.md delete mode 100644 apps/matrix/bridges/whatsapp/Dockerfile create mode 100644 apps/matrix/databases/base/bridges.yaml create mode 100644 apps/matrix/databases/base/synapse-redis.yaml create mode 100644 apps/matrix/databases/base/synapse.yaml delete mode 100644 apps/matrix/databases/base/whatsapp.yaml diff --git a/apps/data/storage/base/postgres/bridges.yaml b/apps/data/storage/base/postgres/bridges.yaml new file mode 100644 index 00000000..0f6eff25 --- /dev/null +++ b/apps/data/storage/base/postgres/bridges.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: bridges-postgres + namespace: matrix +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn + resources: + requests: + storage: 15Gi diff --git a/apps/data/storage/kustomization.yaml b/apps/data/storage/kustomization.yaml index 8883f9a4..2e135363 100644 --- a/apps/data/storage/kustomization.yaml +++ b/apps/data/storage/kustomization.yaml @@ -35,3 +35,4 @@ resources: - base/matrix/synapse.yaml - base/matrix/bridges.yaml - base/matrix/whats.yaml +- base/postgres/bridges.yaml diff --git a/apps/home/ha/base/db.yaml b/apps/home/ha/base/db.yaml index 50c17de1..a27f0f89 100644 --- a/apps/home/ha/base/db.yaml +++ b/apps/home/ha/base/db.yaml @@ -26,13 +26,6 @@ spec: volumeSource: PersistentVolumeClaim: claimName: homeassistant-postgres - resources: - requests: - cpu: 150m - memory: 350Mi - limits: - cpu: 350m - memory: 600Mi nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: diff --git a/apps/matrix/Dockerfile b/apps/matrix/Dockerfile new file mode 100644 index 00000000..e1b1afea --- /dev/null +++ b/apps/matrix/Dockerfile @@ -0,0 +1,5 @@ +FROM alpine:3.16.2 +RUN apk add --no-cache curl \ + && curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst \ + && chmod +x envsubst \ + && mv envsubst /usr/local/bin diff --git a/apps/matrix/bridges/telegram/README.md b/apps/matrix/bridges/telegram/README.md new file mode 100644 index 00000000..ddd3f617 --- /dev/null +++ b/apps/matrix/bridges/telegram/README.md @@ -0,0 +1 @@ +## Matrix Telegram Bridge \ No newline at end of file diff --git a/apps/matrix/bridges/whatsapp/Dockerfile b/apps/matrix/bridges/whatsapp/Dockerfile deleted file mode 100644 index 9e83f284..00000000 --- a/apps/matrix/bridges/whatsapp/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM dock.mau.dev/mautrix/whatsapp:v0.7.1 -RUN curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst \ - && chmod +x envsubst \ - && mv envsubst /usr/local/bin diff --git a/apps/matrix/bridges/whatsapp/cm.yaml b/apps/matrix/bridges/whatsapp/cm.yaml index 1374d76f..a4e77017 100644 --- a/apps/matrix/bridges/whatsapp/cm.yaml +++ b/apps/matrix/bridges/whatsapp/cm.yaml @@ -5,416 +5,157 @@ metadata: data: config.yaml.tmpl: | homeserver: - # The address that this appservice can use to connect to the homeserver. - address: https://bridge.test - # The domain of the homeserver (for MXIDs, etc). - domain: bridge.test - - # What software is the homeserver running? - # Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here. - software: standard - # The URL to push real-time bridge status to. - # If set, the bridge will make POST requests to this URL whenever a user's whatsapp connection state changes. - # The bridge will use the appservice as_token to authorize requests. - status_endpoint: null - # Endpoint for reporting per-message status. - message_send_checkpoint_endpoint: null - # Does the homeserver support https://github.com/matrix-org/matrix-spec-proposals/pull/2246? - async_media: false - - # Application service host/registration related details. - # Changing these values requires regeneration of the registration. + address: https://matrix.gr.wtf + domain: matrix.gr.wtf + software: standard + status_endpoint: null + message_send_checkpoint_endpoint: null + async_media: false appservice: - # The address that the homeserver can use to connect to this appservice. - address: http://localhost:29318 - - # The hostname and port where this appservice should listen. - hostname: 0.0.0.0 - port: 29318 - - # Database config. - database: - # The database type. "sqlite3" and "postgres" are supported. - type: postgres - uri: postgres://${BRIDGE_DB_USERNAME}:${BRIDGE_DB_PASSWORD}@db-whats-bridge.matrix.svc.cluster.local:5432/whats?sslmode=disable - max_open_conns: 20 - max_idle_conns: 2 - max_conn_idle_time: null - max_conn_lifetime: null - - # The unique ID of this appservice. - id: whatsapp - # Appservice bot details. - bot: - # Username of the appservice bot. - username: whatsappbot - # Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty - # to leave display name/avatar as-is. - displayname: WhatsApp bridge bot - avatar: mxc://maunium.net/NeXNQarUbrlYBiPCpprYsRqr - - # Whether or not to receive ephemeral events via appservice transactions. - # Requires MSC2409 support (i.e. Synapse 1.22+). - # You should disable bridge -> sync_with_custom_puppets when this is enabled. - ephemeral_events: true - - # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify. - as_token: "This value is generated when generating the registration" - hs_token: "This value is generated when generating the registration" - - # Segment API key to track some events, like provisioning API login and encryption errors. + address: http://telegram-bridge:29318 + hostname: 0.0.0.0 + port: 29318 + database: + type: postgres + uri: postgres://${BRIDGE_DB_USERNAME}:${BRIDGE_DB_PASSWORD}@db-whats-bridge.matrix.svc.cluster.local:5432/whats?sslmode=disable + max_open_conns: 20 + max_idle_conns: 2 + max_conn_idle_time: null + max_conn_lifetime: null + id: whatsapp + bot: + username: whatsappbot + displayname: WhatsApp bridge bot + avatar: mxc://maunium.net/NeXNQarUbrlYBiPCpprYsRqr + ephemeral_events: true + as_token: This value is generated when generating the registration + hs_token: This value is generated when generating the registration segment_key: null - - # Prometheus config. metrics: - # Enable prometheus metrics? - enabled: false - # IP and port where the metrics listener should be. The path is always /metrics - listen: 127.0.0.1:8001 - - # Config for things that are directly sent to WhatsApp. + enabled: false + listen: 127.0.0.1:8001 whatsapp: - # Device name that's shown in the "WhatsApp Web" section in the mobile app. - os_name: Mautrix-WhatsApp bridge - # Browser name that determines the logo shown in the mobile app. - # Must be "unknown" for a generic icon or a valid browser name if you want a specific icon. - # List of valid browser names: https://github.com/tulir/whatsmeow/blob/8b34d886d543b72e5f4699cf5b2797f68d598f78/binary/proto/def.proto#L38-L51 - browser_name: unknown - - # Bridge config + os_name: Mautrix-WhatsApp bridge + browser_name: unknown bridge: - # Localpart template of MXIDs for WhatsApp users. - # {{.}} is replaced with the phone number of the WhatsApp user. - username_template: whatsapp_{{.}} - # Displayname template for WhatsApp users. - # {{.PushName}} - nickname set by the WhatsApp user - # {{.BusinessName}} - validated WhatsApp business name - # {{.Phone}} - phone number (international format) - # The following variables are also available, but will cause problems on multi-user instances: - # {{.FullName}} - full name from contact list - # {{.FirstName}} - first name from contact list - displayname_template: "{{if .BusinessName}}{{.BusinessName}}{{else if .PushName}}{{.PushName}}{{else}}{{.JID}}{{end}} (WA)" - # Should the bridge create a space for each logged-in user and add bridged rooms to it? - # Users who logged in before turning this on should run `!wa sync space` to create and fill the space for the first time. - personal_filtering_spaces: false - # Should the bridge send a read receipt from the bridge bot when a message has been sent to WhatsApp? - delivery_receipts: false - # Whether the bridge should send the message status as a custom com.beeper.message_send_status event. - message_status_events: false - # Whether the bridge should send error notices via m.notice events when a message fails to bridge. - message_error_notices: true - # Should incoming calls send a message to the Matrix room? - call_start_notices: true - # Should another user's cryptographic identity changing send a message to Matrix? - identity_change_notices: false - portal_message_buffer: 128 - # Settings for handling history sync payloads. - history_sync: - # Should the bridge create portals for chats in the history sync payload? - create_portals: true - # Enable backfilling history sync payloads from WhatsApp using batch sending? - # This requires a server with MSC2716 support, which is currently an experimental feature in synapse. - # It can be enabled by setting experimental_features -> msc2716_enabled to true in homeserver.yaml. - # Note that prior to Synapse 1.49, there were some bugs with the implementation, especially if using event persistence workers. - # There are also still some issues in Synapse's federation implementation. - backfill: false - # Use double puppets for backfilling? - # In order to use this, the double puppets must be in the appservice's user ID namespace - # (because the bridge can't use the double puppet access token with batch sending). - # This only affects double puppets on the local server, double puppets on other servers will never be used. - double_puppet_backfill: false - # Should the bridge request a full sync from the phone when logging in? - # This bumps the size of history syncs from 3 months to 1 year. - request_full_sync: false - # Settings for media requests. If the media expired, then it will not - # be on the WA servers. - # Media can always be requested by reacting with the ♻️ (recycle) emoji. - # These settings determine if the media requests should be done - # automatically during or after backfill. - media_requests: - # Should expired media be automatically requested from the server as - # part of the backfill process? - auto_request_media: true - # Whether to request the media immediately after the media message - # is backfilled ("immediate") or at a specific time of the day - # ("local_time"). - request_method: immediate - # If request_method is "local_time", what time should the requests - # be sent (in minutes after midnight)? - request_local_time: 120 - # The maximum number of initial conversations that should be synced. - # Other conversations will be backfilled on demand when the start PM - # provisioning endpoint is used or when a message comes in from that - # chat. - max_initial_conversations: -1 - # If this value is greater than 0, then if the conversation's last - # message was more than this number of hours ago, then the conversation - # will automatically be marked it as read. - # Conversations that have a last message that is less than this number - # of hours ago will have their unread status synced from WhatsApp. - unread_hours_threshold: 0 - # Settings for immediate backfills. These backfills should generally be - # small and their main purpose is to populate each of the initial chats - # (as configured by max_initial_conversations) with a few messages so - # that you can continue conversations without loosing context. - immediate: - # The number of concurrent backfill workers to create for immediate - # backfills. Note that using more than one worker could cause the - # room list to jump around since there are no guarantees about the - # order in which the backfills will complete. - worker_count: 1 - # The maximum number of events to backfill initially. - max_events: 10 - # Settings for deferred backfills. The purpose of these backfills are - # to fill in the rest of the chat history that was not covered by the - # immediate backfills. These backfills generally should happen at a - # slower pace so as not to overload the homeserver. - # Each deferred backfill config should define a "stage" of backfill - # (i.e. the last week of messages). The fields are as follows: - # - start_days_ago: the number of days ago to start backfilling from. - # To indicate the start of time, use -1. For example, for a week ago, use 7. - # - max_batch_events: the number of events to send per batch. - # - batch_delay: the number of seconds to wait before backfilling each batch. - deferred: - # Last Week - - start_days_ago: 7 - max_batch_events: 20 - batch_delay: 5 - # Last Month - - start_days_ago: 30 - max_batch_events: 50 - batch_delay: 10 - # Last 3 months - - start_days_ago: 90 - max_batch_events: 100 - batch_delay: 10 - # The start of time - - start_days_ago: -1 - max_batch_events: 500 - batch_delay: 10 - # Should puppet avatars be fetched from the server even if an avatar is already set? - user_avatar_sync: true - # Should Matrix users leaving groups be bridged to WhatsApp? - bridge_matrix_leave: true - # Should the bridge sync with double puppeting to receive EDUs that aren't normally sent to appservices. - sync_with_custom_puppets: false - # Should the bridge update the m.direct account data event when double puppeting is enabled. - # Note that updating the m.direct event is not atomic (except with mautrix-asmux) - # and is therefore prone to race conditions. - sync_direct_chat_list: false - # Should the bridge use MSC2867 to bridge manual "mark as unread"s from - # WhatsApp and set the unread status on initial backfill? - # This will only work on clients that support the m.marked_unread or - # com.famedly.marked_unread room account data. - sync_manual_marked_unread: true - # When double puppeting is enabled, users can use `!wa toggle` to change whether - # presence and read receipts are bridged. These settings set the default values. - # Existing users won't be affected when these are changed. - default_bridge_receipts: true - default_bridge_presence: true - # Send the presence as "available" to whatsapp when users start typing on a portal. - # This works as a workaround for homeservers that do not support presence, and allows - # users to see when the whatsapp user on the other side is typing during a conversation. - send_presence_on_typing: false - # Should the bridge always send "active" delivery receipts (two gray ticks on WhatsApp) - # even if the user isn't marked as online (e.g. when presence bridging isn't enabled)? - # - # By default, the bridge acts like WhatsApp web, which only sends active delivery - # receipts when it's in the foreground. - force_active_delivery_receipts: false - # Servers to always allow double puppeting from - double_puppet_server_map: - example.com: https://example.com - # Allow using double puppeting from any server with a valid client .well-known file. - double_puppet_allow_discovery: false - # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth - # - # If set, double puppeting will be enabled automatically for local users - # instead of users having to find an access token and run `login-matrix` - # manually. - login_shared_secret_map: - example.com: foobar - # Should the bridge explicitly set the avatar and room name for private chat portal rooms? - # This is implicitly enabled in encrypted rooms. - private_chat_portal_meta: false - # Should group members be synced in parallel? This makes member sync faster - parallel_member_sync: false - # Should Matrix m.notice-type messages be bridged? - bridge_notices: true - # Set this to true to tell the bridge to re-send m.bridge events to all rooms on the next run. - # This field will automatically be changed back to false after it, except if the config file is not writable. - resend_bridge_info: false - # When using double puppeting, should muted chats be muted in Matrix? - mute_bridging: false - # When using double puppeting, should archived chats be moved to a specific tag in Matrix? - # Note that WhatsApp unarchives chats when a message is received, which will also be mirrored to Matrix. - # This can be set to a tag (e.g. m.lowpriority), or null to disable. - archive_tag: null - # Same as above, but for pinned chats. The favorite tag is called m.favourite - pinned_tag: null - # Should mute status and tags only be bridged when the portal room is created? - tag_only_on_create: true - # Should WhatsApp status messages be bridged into a Matrix room? - # Disabling this won't affect already created status broadcast rooms. - enable_status_broadcast: true - # Should sending WhatsApp status messages be allowed? - # This can cause issues if the user has lots of contacts, so it's disabled by default. - disable_status_broadcast_send: true - # Should the status broadcast room be muted and moved into low priority by default? - # This is only applied when creating the room, the user can unmute it later. - mute_status_broadcast: true - # Tag to apply to the status broadcast room. - status_broadcast_tag: m.lowpriority - # Should the bridge use thumbnails from WhatsApp? - # They're disabled by default due to very low resolution. - whatsapp_thumbnail: false - # Allow invite permission for user. User can invite any bots to room with whatsapp - # users (private chat and groups) - allow_user_invite: false - # Whether or not created rooms should have federation enabled. - # If false, created portal rooms will never be federated. - federate_rooms: true - # Whether to enable disappearing messages in groups. If enabled, then the expiration time of - # the messages will be determined by the first user to read the message, rather than individually. - # If the bridge only has a single user, this can be turned on safely. - disappearing_messages_in_groups: false - # Should the bridge never send alerts to the bridge management room? - # These are mostly things like the user being logged out. - disable_bridge_alerts: false - # Should the bridge stop if the WhatsApp server says another user connected with the same session? - # This is only safe on single-user bridges. - crash_on_stream_replaced: false - # Should the bridge detect URLs in outgoing messages, ask the homeserver to generate a preview, - # and send it to WhatsApp? URL previews can always be sent using the `com.beeper.linkpreviews` - # key in the event content even if this is disabled. - url_previews: false - # Send captions in the same message as images. This will send data compatible with both MSC2530 and MSC3552. - # This is currently not supported in most clients. - caption_in_message: false - # Should Matrix edits be bridged to WhatsApp edits? - # Official WhatsApp clients don't render edits yet, but once they do, the bridge should work with them right away. - send_whatsapp_edits: false - # Maximum time for handling Matrix events. Duration strings formatted for https://pkg.go.dev/time#ParseDuration - # Null means there's no enforced timeout. - message_handling_timeout: - # Send an error message after this timeout, but keep waiting for the response until the deadline. - # This is counted from the origin_server_ts, so the warning time is consistent regardless of the source of delay. - # If the message is older than this when it reaches the bridge, the message won't be handled at all. - error_after: null - # Drop messages after this timeout. They may still go through if the message got sent to the servers. - # This is counted from the time the bridge starts handling the message. - deadline: 120s - - # The prefix for commands. Only required in non-management rooms. - command_prefix: "!wa" - - # Messages sent upon joining a management room. - # Markdown is supported. The defaults are listed below. - management_room_text: - # Sent when joining a room. - welcome: "Hello, I'm a WhatsApp bridge bot." - # Sent when joining a management room and the user is already logged in. - welcome_connected: "Use `help` for help." - # Sent when joining a management room and the user is not logged in. - welcome_unconnected: "Use `help` for help or `login` to log in." - # Optional extra text sent when joining a management room. - additional_help: "" - - # End-to-bridge encryption support options. - # - # See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info. - encryption: - # Allow encryption, work in group chat rooms with e2ee enabled - allow: false - # Default to encryption, force-enable encryption in all portals the bridge creates - # This will cause the bridge bot to be in private chats for the encryption to work properly. - default: false - # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data. - appservice: false - # Require encryption, drop any unencrypted messages. - require: false - # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled. - # You must use a client that supports requesting keys from other users to use this feature. - allow_key_sharing: false - # What level of device verification should be required from users? - # - # Valid levels: - # unverified - Send keys to all device in the room. - # cross-signed-untrusted - Require valid cross-signing, but trust all cross-signing keys. - # cross-signed-tofu - Require valid cross-signing, trust cross-signing keys on first use (and reject changes). - # cross-signed-verified - Require valid cross-signing, plus a valid user signature from the bridge bot. - # Note that creating user signatures from the bridge bot is not currently possible. - # verified - Require manual per-device verification - # (currently only possible by modifying the `trust` column in the `crypto_device` database table). - verification_levels: - # Minimum level for which the bridge should send keys to when bridging messages from WhatsApp to Matrix. - receive: unverified - # Minimum level that the bridge should accept for incoming Matrix messages. - send: unverified - # Minimum level that the bridge should require for accepting key requests. - share: cross-signed-tofu - # Options for Megolm room key rotation. These options allow you to - # configure the m.room.encryption event content. See: - # https://spec.matrix.org/v1.3/client-server-api/#mroomencryption for - # more information about that event. - rotation: - # Enable custom Megolm room key rotation settings. Note that these - # settings will only apply to rooms created after this option is - # set. - enable_custom: false - # The maximum number of milliseconds a session should be used - # before changing it. The Matrix spec recommends 604800000 (a week) - # as the default. - milliseconds: 604800000 - # The maximum number of messages that should be sent with a given a - # session before changing it. The Matrix spec recommends 100 as the - # default. - messages: 100 - - # Settings for provisioning API - provisioning: - # Prefix for the provisioning API paths. - prefix: /_matrix/provision - # Shared secret for authentication. If set to "generate", a random secret will be generated, - # or if set to "disable", the provisioning API will be disabled. - shared_secret: generate - - permissions: - "*": relay - "bridge.test": user - "@admin:bridge.test": admin - - # Settings for relay mode - relay: - # Whether relay mode should be allowed. If allowed, `!wa set-relay` can be used to turn any - # authenticated user into a relaybot for that chat. - enabled: false - # Should only admins be allowed to set themselves as relay users? - admin_only: true - # The formats to use when sending messages to WhatsApp via the relaybot. - message_formats: - m.text: "{{ .Sender.Displayname }}: {{ .Message }}" - m.notice: "{{ .Sender.Displayname }}: {{ .Message }}" - m.emote: "* {{ .Sender.Displayname }} {{ .Message }}" - m.file: "{{ .Sender.Displayname }} sent a file" - m.image: "{{ .Sender.Displayname }} sent an image" - m.audio: "{{ .Sender.Displayname }} sent an audio file" - m.video: "{{ .Sender.Displayname }} sent a video" - m.location: "{{ .Sender.Displayname }} sent a location" - - # Logging config. + username_template: whatsapp_{{.}} + displayname_template: '{{if .BusinessName}}{{.BusinessName}}{{else if .PushName}}{{.PushName}}{{else}}{{.JID}}{{end}} (WA)' + personal_filtering_spaces: false + delivery_receipts: false + message_status_events: false + message_error_notices: true + call_start_notices: true + identity_change_notices: true + portal_message_buffer: 128 + history_sync: + create_portals: true + backfill: true + double_puppet_backfill: false + request_full_sync: true + media_requests: + auto_request_media: true + request_method: immediate + request_local_time: 120 + max_initial_conversations: -1 + unread_hours_threshold: 0 + immediate: + worker_count: 1 + max_events: 10 + deferred: + - start_days_ago: 7 + max_batch_events: 20 + batch_delay: 5 + - start_days_ago: 30 + max_batch_events: 50 + batch_delay: 10 + - start_days_ago: 90 + max_batch_events: 100 + batch_delay: 10 + - start_days_ago: -1 + max_batch_events: 500 + batch_delay: 10 + user_avatar_sync: true + bridge_matrix_leave: true + sync_with_custom_puppets: true + sync_direct_chat_list: true + sync_manual_marked_unread: true + default_bridge_receipts: true + default_bridge_presence: true + send_presence_on_typing: false + force_active_delivery_receipts: false + double_puppet_server_map: + matrix.gr.wtf: http://100.109.36.92:8008 + double_puppet_allow_discovery: false + login_shared_secret_map: + example.com: foobar + private_chat_portal_meta: false + parallel_member_sync: false + bridge_notices: true + resend_bridge_info: false + mute_bridging: false + archive_tag: null + pinned_tag: null + tag_only_on_create: true + enable_status_broadcast: true + disable_status_broadcast_send: true + mute_status_broadcast: true + status_broadcast_tag: m.lowpriority + whatsapp_thumbnail: false + allow_user_invite: false + federate_rooms: true + disappearing_messages_in_groups: false + disable_bridge_alerts: false + crash_on_stream_replaced: false + url_previews: false + caption_in_message: false + send_whatsapp_edits: false + message_handling_timeout: + error_after: null + deadline: 120s + command_prefix: '!wa' + management_room_text: + welcome: Hello, I'm a WhatsApp bridge bot. + welcome_connected: Use `help` for help. + welcome_unconnected: Use `help` for help or `login` to log in. + additional_help: '' + encryption: + allow: false + default: false + appservice: false + require: false + allow_key_sharing: false + verification_levels: + receive: unverified + send: unverified + share: cross-signed-tofu + rotation: + enable_custom: false + milliseconds: 604800000 + messages: 100 + provisioning: + prefix: /_matrix/provision + shared_secret: generate + permissions: + '*': relay + bridge.test: user + '@admin:bridge.test': admin + # Settings for relay mode + relay: + enabled: false + admin_only: true + message_formats: + m.text: '{{ .Sender.Displayname }}: {{ .Message }}' + m.notice: '{{ .Sender.Displayname }}: {{ .Message }}' + m.emote: '* {{ .Sender.Displayname }} {{ .Message }}' + m.file: {{ .Sender.Displayname }} sent a file + m.image: {{ .Sender.Displayname }} sent an image + m.audio: {{ .Sender.Displayname }} sent an audio file + m.video: {{ .Sender.Displayname }} sent a video + m.location: {{ .Sender.Displayname }} sent a location logging: - # The directory for log files. Will be created if not found. - directory: ./logs - # Available variables: .Date for the file date and .Index for different log files on the same day. - # Set this to null to disable logging to file. - file_name_format: "{{.Date}}-{{.Index}}.log" - # Date format for file names in the Go time format: https://golang.org/pkg/time/#pkg-constants - file_date_format: "2006-01-02" - # Log file permissions. - file_mode: 0o600 - # Timestamp format for log entries in the Go time format. - timestamp_format: "Jan _2, 2006 15:04:05" - # Minimum severity for log messages printed to stdout/stderr. This doesn't affect the log file. - # Options: debug, info, warn, error, fatal - print_level: debug + directory: ./logs + file_name_format: '{{.Date}}-{{.Index}}.log' + file_date_format: '2006-01-02' + file_mode: 384 + timestamp_format: Jan _2, 2006 15:04:05 + print_level: debug diff --git a/apps/matrix/bridges/whatsapp/deployment.yaml b/apps/matrix/bridges/whatsapp/deployment.yaml index 46b05705..adeedcab 100644 --- a/apps/matrix/bridges/whatsapp/deployment.yaml +++ b/apps/matrix/bridges/whatsapp/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: initContainers: - name: load-config - image: docker.io/grubertech/whats-bridge:v0.7.1 + image: docker.io/grubertech/envsubst:v1.2.0 imagePullPolicy: IfNotPresent command: ["sh"] args: @@ -26,9 +26,9 @@ spec: && cp /load/config.yaml /data/config.yaml env: - name: BRIDGE_DB_USERNAME - valueFrom: { secretKeyRef: { name: matrix.db-whats-bridge.credentials.postgresql.acid.zalan.do, key: username } } + valueFrom: { secretKeyRef: { name: matrix.db-bridges.credentials.postgresql.acid.zalan.do, key: username } } - name: BRIDGE_DB_PASSWORD - valueFrom: { secretKeyRef: { name: matrix.db-whats-bridge.credentials.postgresql.acid.zalan.do, key: password } } + valueFrom: { secretKeyRef: { name: matrix.db-bridges.credentials.postgresql.acid.zalan.do, key: password } } volumeMounts: - name: config mountPath: /data @@ -51,7 +51,7 @@ spec: readOnlyRootFilesystem: true allowPrivilegeEscalation: false - name: generate-config - image: docker.io/grubertech/whats-bridge:v0.7.1 + image: dock.mau.dev/mautrix/whatsapp:v0.7.1 imagePullPolicy: IfNotPresent command: ["mautrix-whatsapp"] args: ["-g", "-c", "/data/config.yaml", "-r", "/bridges/whatsapp.yaml"] @@ -75,7 +75,7 @@ spec: allowPrivilegeEscalation: false containers: - name: whats - image: docker.io/grubertech/whats-bridge:v0.7.1 + image: dock.mau.dev/mautrix/whatsapp:v0.7.1 imagePullPolicy: IfNotPresent command: ["mautrix-whatsapp"] args: ["-c", "/data/config.yaml"] diff --git a/apps/matrix/bridges/whatsapp/kustomization.yaml b/apps/matrix/bridges/whatsapp/kustomization.yaml index 4702a7e5..628cc8e7 100644 --- a/apps/matrix/bridges/whatsapp/kustomization.yaml +++ b/apps/matrix/bridges/whatsapp/kustomization.yaml @@ -3,4 +3,4 @@ kind: Kustomization resources: - cm.yaml - deployment.yaml -- svc.yaml \ No newline at end of file +- svc.yaml diff --git a/apps/matrix/databases/base/bridges.yaml b/apps/matrix/databases/base/bridges.yaml new file mode 100644 index 00000000..8da7f5ab --- /dev/null +++ b/apps/matrix/databases/base/bridges.yaml @@ -0,0 +1,49 @@ +apiVersion: "acid.zalan.do/v1" +kind: postgresql +metadata: + name: db-bridges +spec: + dockerImage: registry.opensource.zalan.do/acid/spilo-14:2.1-p6 + teamId: "db" + numberOfInstances: 2 + users: + admin: + - superuser + - createdb + matrix: [] + databases: + telegram: matrix + skype: matrix + whats: matrix + messenger: matrix + instagram: matrix + signal: matrix + discord: matrix + postgresql: + version: "14" + volume: + size: 2Gi + storageClass: longhorn + resources: + requests: + cpu: 300m + memory: 500Mi + limits: + cpu: 600m + memory: 1Gi + additionalVolumes: + - name: data + mountPath: /home/postgres/pgdata/partitions + targetContainers: + - postgres + volumeSource: + PersistentVolumeClaim: + claimName: bridges-postgres + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: postgres-operator + operator: In + values: + - enabled diff --git a/apps/matrix/databases/base/kustomization.yaml b/apps/matrix/databases/base/kustomization.yaml index eec32a86..63ffc1ea 100644 --- a/apps/matrix/databases/base/kustomization.yaml +++ b/apps/matrix/databases/base/kustomization.yaml @@ -1,4 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- whatsapp.yaml +- bridges.yaml +- synapse.yaml +- synapse-redis.yaml \ No newline at end of file diff --git a/apps/matrix/databases/base/synapse-redis.yaml b/apps/matrix/databases/base/synapse-redis.yaml new file mode 100644 index 00000000..441cba9f --- /dev/null +++ b/apps/matrix/databases/base/synapse-redis.yaml @@ -0,0 +1,42 @@ +apiVersion: redis.redis.opstreelabs.in/v1beta1 +kind: RedisCluster +metadata: + name: synapse +spec: + clusterSize: 3 + clusterVersion: v7 + persistenceEnabled: true + securityContext: + runAsUser: 1000 + fsGroup: 1000 + kubernetesConfig: + image: quay.io/opstree/redis:v7.0.5 + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 101m + memory: 128Mi + limits: + cpu: 300m + memory: 512Mi + redisExporter: + enabled: false + image: quay.io/opstree/redis-exporter:v1.44.0 + imagePullPolicy: Always + resources: + requests: + cpu: 50m + memory: 128Mi + limits: + cpu: 120m + memory: 256Mi + storage: + volumeClaimTemplate: + spec: + storageClassName: longhorn + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 1Gi + nodeSelector: + kubernetes.io/hostname: node-two diff --git a/apps/matrix/databases/base/synapse.yaml b/apps/matrix/databases/base/synapse.yaml new file mode 100644 index 00000000..9f2bda4b --- /dev/null +++ b/apps/matrix/databases/base/synapse.yaml @@ -0,0 +1,36 @@ +apiVersion: "acid.zalan.do/v1" +kind: postgresql +metadata: + name: db-synapse +spec: + dockerImage: registry.opensource.zalan.do/acid/spilo-14:2.1-p6 + teamId: "db" + numberOfInstances: 1 + users: + admin: + - superuser + - createdb + matrix: [] + databases: + synapse: matrix + postgresql: + version: "14" + volume: + size: 2Gi + storageClass: longhorn + additionalVolumes: + - name: data + mountPath: /home/postgres/pgdata/partitions + targetContainers: + - postgres + volumeSource: + PersistentVolumeClaim: + claimName: synapse-postgres + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: postgres-operator + operator: In + values: + - enabled diff --git a/apps/matrix/databases/base/whatsapp.yaml b/apps/matrix/databases/base/whatsapp.yaml deleted file mode 100644 index a34e1fdb..00000000 --- a/apps/matrix/databases/base/whatsapp.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: "acid.zalan.do/v1" -kind: postgresql -metadata: - name: db-whats-bridge -spec: - dockerImage: registry.opensource.zalan.do/acid/spilo-14:2.1-p6 - teamId: "db" - numberOfInstances: 1 - users: - admin: - - superuser - - createdb - matrix: [] - databases: - whats: matrix - postgresql: - version: "14" - volume: - size: 5Gi - storageClass: longhorn - resources: - requests: - cpu: 150m - memory: 350Mi - limits: - cpu: 200m - memory: 510Mi diff --git a/apps/services/n8n/base/db.yaml b/apps/services/n8n/base/db.yaml index 58019de9..cb76e44a 100644 --- a/apps/services/n8n/base/db.yaml +++ b/apps/services/n8n/base/db.yaml @@ -26,13 +26,6 @@ spec: volumeSource: PersistentVolumeClaim: claimName: n8n-postgres - resources: - requests: - cpu: 50m - memory: 350Mi - limits: - cpu: 150m - memory: 600Mi nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: diff --git a/tasks/matrix.yaml b/tasks/matrix.yaml index 8c1fafca..93bd0a56 100644 --- a/tasks/matrix.yaml +++ b/tasks/matrix.yaml @@ -11,26 +11,24 @@ vars: RESET: tput sgr0 CLEAR: tput reset PATH_ERROR: is not installed or correctly configured in PATH. - WHATSAPP_VERSION: v0.7.1 + ENV_VERSION: v1.2.0 silent: true tasks: - build:whats: + build:env: cmds: - - docker build -t docker.io/grubertech/whats-bridge:latest -t docker.io/grubertech/whats-bridge:{{.WHATSAPP_VERSION}} -f apps/matrix/bridges/whatsapp/Dockerfile . + - docker build -t docker.io/grubertech/envsubst:latest -t docker.io/grubertech/envsubst:{{.ENV_VERSION}} -f apps/matrix/Dockerfile . ignore_error: true - push:whats: + push:env: cmds: - - docker push docker.io/grubertech/whats-bridge:latest - - docker push docker.io/grubertech/whats-bridge:{{.WHATSAPP_VERSION}} + - docker push docker.io/grubertech/envsubst:latest + - docker push docker.io/grubertech/envsubst:{{.ENV_VERSION}} ignore_error: true - test:whats: + test:env: cmds: - echo -e "Envsubst:\n" - - docker run --rm --name whatsapp-bridge -it docker.io/grubertech/whats-bridge:latest /bin/sh -c 'envsubst' - - echo -e "Testing bridge command:\n" - - docker run --rm --name whatsapp-bridge -it docker.io/grubertech/whats-bridge:latest /bin/sh -c 'mautrix-whatsapp' + - docker run --rm --name envsubst -it docker.io/grubertech/envsubst:latest /bin/sh -c 'envsubst' ignore_error: true