diff --git a/docs/concepts-and-configurations/matrix-moderation.md b/docs/concepts-and-configurations/matrix-moderation.md index b1c16edd..fc307645 100644 --- a/docs/concepts-and-configurations/matrix-moderation.md +++ b/docs/concepts-and-configurations/matrix-moderation.md @@ -27,10 +27,9 @@ The bot account `@moderation:hamburg.ccc.de` (Draupnir) maintains various intern These can include, for example, user bans or entire server bans. Additionally, certain automatic monitoring measures (so-called "protections") apply in these rooms, which trigger a configured action if violated. For example, a user is not allowed to tag too many other users in a single message, as this is considered spam and results in a kick. -The bot is controlled and configured via a privileged *CCCHH Moderation Management* room using `!draupnir` commands. +The bot is controlled and configured via a privileged *CCCHH Moderation Management* room using `!mjolnir` commands. There, individual actions can also be triggered through the bot as needed, such as redacting messages, kicking users from all or some channels, etc. -Currently we operate **two policy lists**: One for internal bans like "Hausverbot" or similar and one for general misconduct like harassment and spam. -It is possible to make our general list available to other entities as well as subscribe our bot to other entities' lists. -Our general list is published in `#general-moderation:hamburg.ccc.de` where other moderation bots can freely watch it. +It is also possible to make our moderation bot's local lists available to other entities and subscribe our bot to other entities' lists. +Our list is published in `#general-moderation:hamburg.ccc.de` where other moderation bots can freely watch it. diff --git a/docs/guides/matrix-taking-moderation-action.md b/docs/guides/matrix-taking-moderation-action.md index 2f1e467c..a516989c 100644 --- a/docs/guides/matrix-taking-moderation-action.md +++ b/docs/guides/matrix-taking-moderation-action.md @@ -18,20 +18,18 @@ All bot actions are triggered through the *CCCHH Moderation Management* room. ## Banning a User ``` -!draupnir ban user +!draupnir ban user general ``` -- `` either `general` for general misconduct or `internal` for CCCHH-internal reasons - `` can be a user ID (e.g. `@example:matrix.org`) but also more sophisticated. Be careful when using actual glob syntax as whole servers can be banned even if just a single user is the intended target. - `` is technically optional but should always be supplied so that we know why a certain user was banned in retrospect. The bot supports parsing quotations so `""` is usually what you want if more than one word is used. ## Banning a Server ``` -!draupnir ban server +!draupnir ban server general ``` -- `` either `general` for general misconduct or `internal` for CCCHH-internal reasons - `` can be used to ban subdomains of a domain too, e.g. `*.example.com`. If used, an additional `--force` is required after the whole command. - `` should be supplied and supports quotation (`"") if more than one word is used - When a domain is banned, we usually also ban all subdomains too. This needs to be done in two separate commands. diff --git a/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2 b/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2 index 8ee08bab..0e3d5e59 100644 --- a/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2 @@ -3,7 +3,7 @@ services: db: - image: mariadb:12.3.2 + image: mariadb:12.3.3 command: --max_allowed_packet=3250585600 environment: MYSQL_ROOT_PASSWORD: "{{ secret__sunders_db_root_password }}"