Skip to content

Commit fb398ef

Browse files
authored
Merge branch 'main' into discourse-gatekeeper/migrate
2 parents eccce6a + eda2d05 commit fb398ef

File tree

102 files changed

+11624
-2188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+11624
-2188
lines changed

.github/ISSUE_TEMPLATE/matrix_bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Matrix Deployment Bug Report
22
description: Report a bug with the chat.ubuntu.com deployment
3-
labels: ["Type: Bug", "Status: Triage", "Context: deployment"]
3+
labels: ["Type: Bug", "Status: Triage", "Context: Deployment"]
44
body:
55
- type: markdown
66
attributes:

.github/ISSUE_TEMPLATE/matrix_enhancement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Matrix Deployment Enhancement
22
description: Suggest a feature for the chat.ubuntu.com deployment
3-
labels: ["Type: Enhancement", "Status: Triage", "deployment"]
3+
labels: ["Type: Enhancement", "Status: Triage", "Context: Deployment"]
44
body:
55
- type: markdown
66
attributes:
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Provide approval for bot PRs
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
bot_pr_approval:
8+
uses: canonical/operator-workflows/.github/workflows/bot_pr_approval.yaml@main
9+
secrets: inherit

.github/workflows/integration_test.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ jobs:
88
uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
99
secrets: inherit
1010
with:
11-
chaos-app-label: app.kubernetes.io/name=synapse
12-
chaos-enabled: false
13-
chaos-experiments: pod-delete
11+
extra-arguments: -x --localstack-address 172.17.0.1
12+
pre-run-script: localstack-installation.sh
1413
trivy-image-config: "trivy.yaml"
14+
juju-channel: 3.1/stable
15+
channel: 1.28-strict/stable
16+
modules: '["test_charm", "test_nginx", "test_s3", "test_redis"]'
1517
self-hosted-runner: true
1618
self-hosted-runner-label: "edge"
19+
tmate-debug: true

.github/workflows/promote_charm.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ jobs:
2323
with:
2424
origin-channel: ${{ github.event.inputs.origin-channel }}
2525
destination-channel: ${{ github.event.inputs.destination-channel }}
26+
doc-automation-disabled: false
2627
secrets: inherit

.licenserc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ header:
3535
- 'zap_rules.tsv'
3636
- 'lib/**'
3737
- 'templates/**'
38+
- 'synapse_rock/cron/**/*.py'
39+
- 'synapse_rock/scripts/**/*.py'
3840
comment: on-failure

.woke.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ ignore_files:
55
- tests/unit/test_synapse_workload.py
66
- docs/reference/integrations.md
77
rules:
8+
# Ignore "master" - While https://github.com/canonical/redis-k8s-operator/pull/78
9+
# is not merged
10+
- name: master
811
# Ignore "grandfathered" used by SAML configuration.
912
- name: grandfathered
1013
# Ignore "whitelist" used by Synapse configuration.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ project that warmly welcomes community projects, contributions, suggestions,
3030
fixes and constructive feedback.
3131
* [Code of conduct](https://ubuntu.com/community/code-of-conduct)
3232
* [Get support](https://discourse.charmhub.io/)
33-
* [Join our online chat](https://chat.charmhub.io/charmhub/channels/charm-dev)
33+
* [Join our online chat](https://matrix.to/#/#charmhub-charmdev:ubuntu.com)
3434
* [Contribute](https://charmhub.io/synapse/docs/contributing)
3535
* [Getting Started](https://charmhub.io/synapse/docs/getting-started)
36-
Thinking about using the Synapse Operator for your next project? [Get in touch](https://chat.charmhub.io/charmhub/channels/charm-dev)!
36+
Thinking about using the Synapse Operator for your next project? [Get in touch](https://matrix.to/#/#charmhub-charmdev:ubuntu.com)!
3737

3838
---

actions.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,30 @@ promote-user-admin:
4141
description: |
4242
User name to be promoted to admin.
4343
type: string
44+
create-backup:
45+
description: |
46+
Creates a backup to s3 storage.
47+
list-backups:
48+
description: |
49+
Lists backups in s3 storage.
50+
restore-backup:
51+
description: |
52+
Restore a Synapse backup.
53+
S3 credentials are retrieved from the relation with the S3 integrator charm.
54+
The server_name and filesystem configuration for the application should be
55+
identical to the application restored.
56+
params:
57+
backup-id:
58+
type: string
59+
description: The backup-id to identify the backup to restore.
60+
required:
61+
- backup-id
62+
delete-backup:
63+
description: |
64+
Delete a backup in s3 storage by backup-id.
65+
params:
66+
backup-id:
67+
type: string
68+
description: The backup-id to identify the backup to delete.
69+
required:
70+
- backup-id

config.yaml

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,21 @@ options:
88
description: |
99
Allows any other homeserver to fetch the server's public rooms directory
1010
via federation.
11+
backup_passphrase:
12+
type: string
13+
description: Passphrase used to encrypt a backup using gpg with symmetric key.
1114
enable_mjolnir:
1215
type: boolean
1316
default: false
1417
description: |
1518
Configures whether to enable Mjolnir - moderation tool for Matrix.
1619
Reference: https://github.com/matrix-org/mjolnir
20+
enable_irc_bridge:
21+
type: boolean
22+
default: false
23+
description: |
24+
Configures whether to enable IRC bridging for Matrix.
25+
Reference: https://github.com/matrix-org/matrix-appservice-irc
1726
enable_password_config:
1827
type: boolean
1928
default: true
@@ -36,6 +45,15 @@ options:
3645
Comma separated list of IP address CIDR ranges that should be allowed for
3746
federation, identity servers, push servers, and for checking key validity
3847
for third-party invite events.
48+
irc_bridge_admins:
49+
type: string
50+
description: |
51+
Comma separated list of admins to be allowed to manage the bridge.
52+
This takes the form of @user1:domainX.com,@user2:domainY.com...
53+
notif_from:
54+
type: string
55+
description: defines the "From" address to use when sending emails.
56+
It must be set if the SMTP integration is enabled. Defaults to server_name.
3957
public_baseurl:
4058
type: string
4159
description: |
@@ -53,31 +71,6 @@ options:
5371
Synapse server name. Must be set to deploy the charm. Corresponds to the
5472
server_name option on Synapse configuration file and sets the
5573
public-facing domain of the server.
56-
smtp_enable_tls:
57-
type: boolean
58-
description: If enabled, STARTTLS will be used to use an encrypted SMTP
59-
connection.
60-
default: true
61-
smtp_host:
62-
type: string
63-
description: The hostname of the SMTP host used for sending emails.
64-
default: ''
65-
smtp_notif_from:
66-
type: string
67-
description: defines the "From" address to use when sending emails.
68-
It must be set if email sending is enabled. Defaults to server_name.
69-
smtp_pass:
70-
type: string
71-
description: The password if the SMTP server requires authentication.
72-
default: ''
73-
smtp_port:
74-
type: int
75-
description: The port of the SMTP server used for sending emails.
76-
default: 25
77-
smtp_user:
78-
type: string
79-
description: The username if the SMTP server requires authentication.
80-
default: ''
8174
trusted_key_servers:
8275
type: string
8376
description: Comma separated list of trusted servers to download signing

0 commit comments

Comments
 (0)