-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #331 from esrg-knights/hotfix/rspamd-settings-memb…
…er-alias Hotfix/rspamd settings member alias
- Loading branch information
Showing
12 changed files
with
200 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
mailcow_integration/templates/mailcow_integration/internal_mailbox.conf
This file was deleted.
Oops, something went wrong.
13 changes: 13 additions & 0 deletions
13
mailcow_integration/templates/mailcow_integration/internal_mailbox_allow.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# MANAGED BY SQUIRE - DO NOT MODIFY | ||
# Last updated on {% now "Y-m-d H:i:s.u" %} | ||
# This rule matches any internal address | ||
# If this rule matches, NO FURTHER RULES ARE CHECKED | ||
priority = 11; | ||
rcpt = "/^({{ addresses|join:'|' }})$/"; | ||
authenticated = yes; | ||
apply "default" { | ||
INTERNAL_MAILBOX_TO_ALIAS = -9999.0; | ||
} | ||
symbols [ | ||
"INTERNAL_MAILBOX_TO_ALIAS" | ||
] |
13 changes: 13 additions & 0 deletions
13
mailcow_integration/templates/mailcow_integration/internal_mailbox_block.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# MANAGED BY SQUIRE - DO NOT MODIFY | ||
# Last updated on {% now "Y-m-d H:i:s.u" %} | ||
# This rule blocks all emails sent to this address. | ||
# Note how this rule has a lower priority than the allow-rule | ||
priority = 10; | ||
rcpt = "/^({{ addresses|join:'|' }})$/"; | ||
|
||
apply "default" { | ||
EXTERNAL_MAILBOX_TO_ALIAS = 9999.0; | ||
} | ||
symbols [ | ||
"EXTERNAL_MAILBOX_TO_ALIAS" | ||
] |
14 changes: 14 additions & 0 deletions
14
mailcow_integration/templates/mailcow_integration/snippets/rspamd_setting.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<p></p> | ||
{% if not rspamd_setting %} | ||
<div class="alert alert-danger d-flex align-items-center" role="alert"> | ||
<i class="fas fa-question-circle mr-3"></i> Setting is missing. | ||
</div> | ||
{% else %} | ||
{% if not rspamd_setting.active %} | ||
<div class="alert alert-danger d-flex align-items-center" role="alert"> | ||
<i class="fas fa-pause-circle mr-3"></i> Setting is inactive. | ||
</div> | ||
{% endif %} | ||
<h5>{{rspamd_setting.desc}} – {{rspamd_setting.id}}</h5> | ||
<pre><code>{{rspamd_setting.content }}</code></pre> | ||
{% endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.