Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Peter
|
5541f84c3c | ||
|
Peter
|
4907f702c8 | ||
|
FreddleSpl0it
|
a1ffaae3d5 | ||
|
FreddleSpl0it
|
f3f6fb8908 | ||
|
FreddleSpl0it
|
a1a96bfabb | ||
|
+5
|
c520f21d28 | ||
|
Michael Gerdemann
|
b1314bd9a3 | ||
|
André
|
6521ccd425 |
@@ -14,7 +14,7 @@ jobs:
|
||||
pull-requests: write
|
||||
steps:
|
||||
- name: Mark/Close Stale Issues and Pull Requests 🗑️
|
||||
uses: actions/stale@v4
|
||||
uses: actions/stale@v5.0.0
|
||||
with:
|
||||
repo-token: ${{ secrets.STALE_ACTION_PAT }}
|
||||
days-before-stale: 60
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
# mailcow: dockerized - 🐮 + 🐋 = 💕
|
||||
|
||||
## We stand with 🇺🇦
|
||||
|
||||
[](https://drone.mailcow.email/mailcow/mailcow-dockerized) [](https://drone.mailcow.email/mailcow/mailcow-dockerized) [](https://translate.mailcow.email/engage/mailcow-dockerized/)
|
||||
[](https://twitter.com/mailcow_email)
|
||||
|
||||
|
||||
+1181
-347
File diff suppressed because it is too large
Load Diff
@@ -161,7 +161,7 @@ try:
|
||||
attrs = json.loads(attrs.decode('utf-8'))
|
||||
if attrs['quarantine_notification'] not in ('hourly', 'daily', 'weekly'):
|
||||
continue
|
||||
if last_notification == 0 or (last_notification + time_trans[attrs['quarantine_notification']]) < time_now:
|
||||
if last_notification == 0 or (last_notification + time_trans[attrs['quarantine_notification']]) <= time_now:
|
||||
print("Notifying %s: Considering %d new items in quarantine (policy: %s)" % (record['rcpt'], record['counter'], attrs['quarantine_notification']))
|
||||
notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'], attrs['quarantine_category'])
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@version: 3.19
|
||||
@version: 3.28
|
||||
@include "scl.conf"
|
||||
options {
|
||||
chain_hostnames(off);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@version: 3.19
|
||||
@version: 3.28
|
||||
@include "scl.conf"
|
||||
options {
|
||||
chain_hostnames(off);
|
||||
|
||||
@@ -8,9 +8,9 @@ RUN apk add --virtual .build-deps gcc musl-dev python3-dev libffi-dev openssl-de
|
||||
&& apk add --update --no-cache python3 py3-pip openssl tzdata libmagic \
|
||||
&& pip3 install --upgrade pip \
|
||||
&& pip3 install --upgrade asyncio python-magic \
|
||||
&& pip3 install --upgrade https://github.com/HeinleinSupport/oletools/archive/master.zip \
|
||||
&& apk del .build-deps \
|
||||
&& sed -i 's/template_injection_detected = True/template_injection_detected = False/g' /usr/lib/python3.9/site-packages/oletools/olevba.py
|
||||
&& pip3 install --upgrade https://github.com/decalage2/oletools/archive/master.zip \
|
||||
&& apk del .build-deps
|
||||
# && sed -i 's/template_injection_detected = True/template_injection_detected = False/g' /usr/lib/python3.9/site-packages/oletools/olevba.py
|
||||
|
||||
ADD olefy.py /app/
|
||||
|
||||
|
||||
@@ -21,7 +21,8 @@ RUN apt-get update && apt-get install -y \
|
||||
&& apt-get clean \
|
||||
&& mkdir -p /run/rspamd \
|
||||
&& chown _rspamd:_rspamd /run/rspamd \
|
||||
&& echo 'alias ll="ls -la --color"' >> ~/.bashrc
|
||||
&& echo 'alias ll="ls -la --color"' >> ~/.bashrc \
|
||||
&& sed -i 's/#analysis_keyword_table > 0/analysis_cat_table.macro_exist == "M"/g' /usr/share/rspamd/lualib/lua_scanners/oletools.lua
|
||||
|
||||
COPY settings.conf /etc/rspamd/settings.conf
|
||||
COPY metadata_exporter.lua /usr/share/rspamd/plugins/metadata_exporter.lua
|
||||
|
||||
@@ -47,6 +47,14 @@ server {
|
||||
return 301 $client_req_scheme_nc://$host/remote.php/dav;
|
||||
}
|
||||
|
||||
location = /.well-known/webfinger {
|
||||
return 301 $client_req_scheme_nc://$host/index.php/.well-known/webfinger;
|
||||
}
|
||||
|
||||
location = /.well-known/nodeinfo {
|
||||
return 301 $client_req_scheme_nc://$host/index.php/.well-known/nodeinfo;
|
||||
}
|
||||
|
||||
location ^~ /.well-known/acme-challenge/ {
|
||||
default_type "text/plain";
|
||||
root /web;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
opcache.enable=1
|
||||
opcache.enable_cli=1
|
||||
opcache.interned_strings_buffer=8
|
||||
opcache.interned_strings_buffer=16
|
||||
opcache.max_accelerated_files=10000
|
||||
opcache.memory_consumption=128
|
||||
opcache.save_comments=1
|
||||
|
||||
@@ -204,6 +204,8 @@ legend {
|
||||
color: #959595;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 100% !important;
|
||||
padding: 0 !important;
|
||||
}
|
||||
.footer .version {
|
||||
margin-left: auto;
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
<div class="col-sm-8">
|
||||
<select data-width="100%" name="exclude_domains" class="selectpicker" title="{{ lang.tfa.select }}" multiple>
|
||||
{% for domain in all_domains %}
|
||||
<option {% if domain in q_data.exclude_domains|keys %}selected{% endif %}>{{ domain }}</option>
|
||||
<option {% if domain in q_data.exclude_domains %}selected{% endif %}>{{ domain }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
+4
-4
@@ -73,7 +73,7 @@ services:
|
||||
- clamd
|
||||
|
||||
rspamd-mailcow:
|
||||
image: mailcow/rspamd:1.79
|
||||
image: mailcow/rspamd:1.80
|
||||
stop_grace_period: 30s
|
||||
depends_on:
|
||||
- dovecot-mailcow
|
||||
@@ -212,7 +212,7 @@ services:
|
||||
- sogo
|
||||
|
||||
dovecot-mailcow:
|
||||
image: mailcow/dovecot:1.160
|
||||
image: mailcow/dovecot:1.161
|
||||
depends_on:
|
||||
- mysql-mailcow
|
||||
dns:
|
||||
@@ -540,7 +540,7 @@ services:
|
||||
- solr
|
||||
|
||||
olefy-mailcow:
|
||||
image: mailcow/olefy:1.8.1
|
||||
image: mailcow/olefy:1.9
|
||||
restart: always
|
||||
environment:
|
||||
- TZ=${TZ}
|
||||
@@ -548,7 +548,7 @@ services:
|
||||
- OLEFY_BINDPORT=10055
|
||||
- OLEFY_TMPDIR=/tmp
|
||||
- OLEFY_PYTHON_PATH=/usr/bin/python3
|
||||
- OLEFY_OLEVBA_PATH=/usr/bin/olevba3
|
||||
- OLEFY_OLEVBA_PATH=/usr/bin/olevba
|
||||
- OLEFY_LOGLVL=20
|
||||
- OLEFY_MINLENGTH=500
|
||||
- OLEFY_DEL_TMP=1
|
||||
|
||||
Reference in New Issue
Block a user