Skip to content
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.

Sign up for GitHub

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

Double bridging rule files #669

Merged
merged 11 commits into from
Oct 12, 2018
Merged

Double bridging rule files #669

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
df13902
Pin m-a-b for room link validator
Half-Shot Aug 29, 2018
7acfc4b
Add support for RoomLinkValidation
Half-Shot Aug 29, 2018
9aeb7ea
Add config schema and new rules sample schema
Half-Shot Aug 29, 2018
9c0d640
Move pinned m-a-b for room link validator
Half-Shot Aug 29, 2018
65e9279
Fix trailing space
Half-Shot Aug 29, 2018
b9c534a
Rename
Half-Shot Oct 5, 2018
13ad30d
Bump m-a-b version
Half-Shot Oct 5, 2018
b279a02
s/watch/enableReload
Half-Shot Oct 5, 2018
ce52c2f
Merge remote-tracking branch 'origin/develop' into hs/double-bridging
Half-Shot Oct 5, 2018
00982d0
Bump m-a-b to 1.7.0
Half-Shot Oct 12, 2018
5e83785
Mock another client call.
Half-Shot Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename
@Half-Shot
Half-Shot committed Oct 5, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit b9c534a4ce04f590a16453ada43abb4333dbc882
10 changes: 6 additions & 4 deletions rules.sample.yaml → provisioning.rules.sample.yaml
View file
Original file line number Diff line number Diff line change
@@ -2,9 +2,11 @@
# If one of the regexes matches a userId, then do not allow provisioning
# to the room UNLESS it also matches a exempt regex.
# This doesn't affect existing bridge entrys, only new provisioned rooms.
#
# For this to work, config.provisioning.ruleFile must point to this file.
userIds:
exempt:
exempt:
- "@appservice-irc:localhost"
- "@irc_:localhost"
conflict:
- "@irc_:.+"
- "@irc_.+:localhost"
conflict:
- "@irc_.+:.+"