-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Add MatrixZulipBridge #4695
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add MatrixZulipBridge #4695
Conversation
Signed-off-by: Suguru Hirahara <[email protected]>
Signed-off-by: Suguru Hirahara <[email protected]>
…vice.j2 - Add the license header to matrix-matrixzulipbridge.service.j2 Signed-off-by: Suguru Hirahara <[email protected]>
…atrixzulipbridge", respectively Signed-off-by: Suguru Hirahara <[email protected]>
Signed-off-by: Suguru Hirahara <[email protected]>
Signed-off-by: Suguru Hirahara <[email protected]>
Signed-off-by: Suguru Hirahara <[email protected]>
Signed-off-by: Suguru Hirahara <[email protected]>
Signed-off-by: Suguru Hirahara <[email protected]>
Run `pip install matrixzulipbridge && python3 -m matrixzulipbridge --config config.yaml --generate` to generate config.yaml Signed-off-by: Suguru Hirahara <[email protected]>
Signed-off-by: Suguru Hirahara <[email protected]>
Signed-off-by: Suguru Hirahara <[email protected]>
Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
dc6a9a3 to
b1c6b70
Compare
Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
0e873e2 to
313737e
Compare
Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
| # MatrixZulipBridge is a puppeting appservice bridge for Zulip | ||
| # Project source code URL: https://github.com/GearKite/MatrixZulipBridge | ||
|
|
||
| matrix_bridge_zulip_enabled: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
matrix_zulip_bridge_* vars look more natural, IMO. Don't steam and go-skype bridge follow the same pattern?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is not a consistent pattern at all as far as I see:
- matrix-bridge-heisenbridge:
matrix_heisenbridge_* - matrix-bridge-hookshot:
matrix_hookshot_* - matrix-bridge-steam:
matrix_steam_bridge_*
I would change them into what's based on a hierarchy:
- matrix-bridge-heisenbridge:
matrix_bridge_heisenbridge_*(we won't set it tomatrix_bridge_heisen_*as "heisenbridge" is the name of the bridge) - matrix-bridge-hookshot:
matrix_bridge_hookshot_* - matrix-bridge-steam:
matrix_bridge_steam_*
Regarding to matrix-bridge-zulip, it seems confusing to switch the place of "bridge" and "zulip" like matrix_zulip_bridge_* against the name of the bridge itself, which respects the hierarchy (despite there being some exceptions like matrix-sms-bridge).
The bridge for Steam is named as matrix-steam-bridge simply because it is the same as the same of the bridge itself (see: https://github.com/jasonlaguidice/matrix-steam-bridge).
If matrix-bridge-heisenbridge variables are set to matrix_bridge_heisenbridge_*, the variables for this bridge should be set to matrix_bridge_matrixzulipbridge_* if we respect the hierarchy for the sake of predictability.
Still, it is a completely different theme, and should definitely be addressed on another occasion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Heisenbridge, Hookshot, Matrix Steam Bridge are component names, so the vars for them are matrix_COMPONENT_*. In the case of Matrix Steam Bridge, the Matrix from the name is omitted/deduplicated to get matrix_steam_bridge_* vars, and I'd personally expect it to be the same for Zulip - matrix_zulip_bridge_*, because the project name is MatrixZulipBridge.
Your point is completely fair - currently hierarchy naming is broken for some components, but considering unique names, I, personally, don't see a big problem here - matrix_mautrix_slack_*, matrix_postmoogle_*, matrix_heisenbridge_*, matrix_hookshot_* look okay-ish
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Created an issue on naming policy here: #4705
Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
Refer to spantaleev#4695 (comment) Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
…dge_owner` Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
group_vars/matrix_servers
Outdated
| + | ||
| ([{'name': 'matrix-hookshot.service', 'priority': 2000, 'groups': ['matrix', 'bridges', 'hookshot', 'bridge-hookshot']}] if matrix_hookshot_enabled else []) | ||
| + | ||
| ([{'name': 'matrix-bridge-zulip.service', 'priority': 2000, 'groups': ['matrix', 'bridges', 'matrixzulipbridge']}] if matrix_zulip_bridge_enabled else []) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use matrix-zulip-bridge for service name and zulip for tags, similar to other bridges
roles/custom/matrix-bridge-zulip/templates/systemd/matrix-zulip-bridge.service.j2
Show resolved
Hide resolved
Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
…guring-playbook-bridge-postmoogle.md Reuse https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/7862fd7cddf82cc067962a6b55747c3242c05630/docs/configuring-playbook-bridge-postmoogle.md Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
…ansible-deploy into matrixzulipbridge
Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
…ansible-deploy into matrixzulipbridge
* Add links to MatrixZulipBridge Signed-off-by: Suguru Hirahara <[email protected]> * Add MatrixZulipBridge: copy matrix-bridge-heisenbridge Signed-off-by: Suguru Hirahara <[email protected]> * Rename matrix-heisenbridge.service.j2 to matrix-matrixzulipbridge.service.j2 - Add the license header to matrix-matrixzulipbridge.service.j2 Signed-off-by: Suguru Hirahara <[email protected]> * Replace "Heisenbridge" to "MatrixZulipBridge" to "heisenbridge" to "matrixzulipbridge", respectively Signed-off-by: Suguru Hirahara <[email protected]> * Replace variables related to container image and version Signed-off-by: Suguru Hirahara <[email protected]> * Update comments and copyright headers Signed-off-by: Suguru Hirahara <[email protected]> * Update matrix-bridge-matrixzulipbridge/tasks/main.yml: add names to tasks Reuse https://app.radicle.xyz/nodes/seed.radicle.garden/rad%3Az3EdzLb58oJYY4L17xrVpYtRPz4ej/tree/aa0591f8b0ff19cee5523ffe5d070ee062e09d62/tasks/main.yml Signed-off-by: Suguru Hirahara <[email protected]> * Remove configuration for identd Signed-off-by: Suguru Hirahara <[email protected]> * Add `matrix_matrixzulipbridge_container_http_port` Signed-off-by: Suguru Hirahara <[email protected]> * Run ansible-lint for files in tasks/ Signed-off-by: Suguru Hirahara <[email protected]> * Update `matrix_matrixzulipbridge_registration_yaml` Run `pip install matrixzulipbridge && python3 -m matrixzulipbridge --config config.yaml --generate` to generate config.yaml Signed-off-by: Suguru Hirahara <[email protected]> * Add MatrixZulipBridge to files in group_vars Signed-off-by: Suguru Hirahara <[email protected]> * Add configuring-playbook-bridge-matrixzulipbridge.md Reuse https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/b108c8a15165cebe346c7b16cbe181a495db6bf7/docs/configuring-playbook-bridge-heisenbridge.md Signed-off-by: Suguru Hirahara <[email protected]> * Fix `matrix_matrixzulipbridge_config_media_path` Signed-off-by: Suguru Hirahara <[email protected]> * Remove space characters Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Replace "matrixzulipbridge" with "zulip", etc. Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Remove irrelevant instruction Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * MatrixZulipBridge → Zulip bridge Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Rename `@matrixzulipbridge` to `@zulipbot` Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Replace `matrix_bridge_zulip` with `matrix_zulip_bridge` for now Refer to spantaleev#4695 (comment) Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Set `{{ matrix_admin if matrix_admin else '' }}` to `matrix_zulip_bridge_owner` Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Apply the review Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Reuse the section about adjusting the playbook configuration on configuring-playbook-bridge-postmoogle.md Reuse https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/7862fd7cddf82cc067962a6b55747c3242c05630/docs/configuring-playbook-bridge-postmoogle.md Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Update configuring-playbook.md: sort list items Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> --------- Signed-off-by: Suguru Hirahara <[email protected]> Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> Co-authored-by: Suguru Hirahara <[email protected]> Co-authored-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
No description provided.