paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rspamd settings and dynamic configuration

master
andryyy 2016-12-16 08:15:20 +01:00
parent 4b7bf81cbd
commit 8559de7ae6
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Dockerfiles/rspamd/Dockerfile
View File

@ -12,6 +12,8 @@ RUN apt-get update \
&& apt-get --no-install-recommends -y --force-yes install rspamd && apt-get --no-install-recommends -y --force-yes install rspamd
RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local
# "Hardcoded" - we need them
RUN echo 'settings = "http://nginx:8081/settings.php";' > /etc/rspamd/modules.d/settings.conf
CMD ["/usr/bin/rspamd","-f", "-u", "_rspamd", "-g", "_rspamd"] CMD ["/usr/bin/rspamd","-f", "-u", "_rspamd", "-g", "_rspamd"]

6
data/conf/rspamd/dynmaps/settings.php
View File

@ -55,7 +55,7 @@ while ($row = array_shift($rows)) {
WHERE `mailbox`.`username` = :object"); WHERE `mailbox`.`username` = :object");
$stmt->execute(array(':object' => $row['object'])); $stmt->execute(array(':object' => $row['object']));
$rows_aliases_2 = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows_aliases_2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row_aliases_2 = array_shift($rows_aliases_2)) { while ($row_aliases_2 = array_filter(array_shift($rows_aliases_2))) {
?> ?>
rcpt = "<?=$row_aliases_2['aliases'];?>"; rcpt = "<?=$row_aliases_2['aliases'];?>";
<?php <?php
@ -126,7 +126,7 @@ while ($row = array_shift($rows)) {
WHERE `mailbox`.`username` = :object"); WHERE `mailbox`.`username` = :object");
$stmt->execute(array(':object' => $row['object'])); $stmt->execute(array(':object' => $row['object']));
$rows_aliases_wl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows_aliases_wl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row_aliases_wl_2 = array_shift($rows_aliases_wl_2)) { while ($row_aliases_wl_2 = array_filter(array_shift($rows_aliases_wl_2))) {
?> ?>
rcpt = "<?=$row_aliases_wl_2['aliases'];?>"; rcpt = "<?=$row_aliases_wl_2['aliases'];?>";
<?php <?php
@ -192,7 +192,7 @@ while ($row = array_shift($rows)) {
WHERE `mailbox`.`username` = :object"); WHERE `mailbox`.`username` = :object");
$stmt->execute(array(':object' => $row['object'])); $stmt->execute(array(':object' => $row['object']));
$rows_aliases_wl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows_aliases_wl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row_aliases_wl_2 = array_shift($rows_aliases_wl_2)) { while ($row_aliases_wl_2 = array_filter(array_shift($rows_aliases_wl_2))) {
?> ?>
rcpt = "<?=$row_aliases_wl_2['aliases'];?>"; rcpt = "<?=$row_aliases_wl_2['aliases'];?>";
<?php <?php

2
data/conf/rspamd/local.d/rspamd.conf.local
View File

@ -1 +1 @@
settings = "http://nginx:8081/settings.php"; # rspamd.conf.local