From 3f74b21cf6beb23a6f7a14d0b9db3e86cf193c3b Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 21 Nov 2013 15:25:48 +0000 Subject: [PATCH] Expand path for logging. --- conf/rspamd-basic.xml.in | 754 --------------------------------------- src/cfg_rcl.c | 2 +- 2 files changed, 1 insertion(+), 755 deletions(-) delete mode 100644 conf/rspamd-basic.xml.in diff --git a/conf/rspamd-basic.xml.in b/conf/rspamd-basic.xml.in deleted file mode 100644 index fbe62512d..000000000 --- a/conf/rspamd-basic.xml.in +++ /dev/null @@ -1,754 +0,0 @@ - - - - - - - - - /tmp - - @LOCALSTATES_PREFIX@/rspamd.pid - - regexp,surbl,chartable,fuzzy_check,spf,dkim - - 1G - - no - - no - - yes - - 1s - - 5 - - @LOCALSTATES_PREFIX@/symbols.cache - - 10.0s - - @LOCALSTATES_PREFIX@/rspamd_dynamic - - no - - - - - - info - no - console - - - - - - - - - default - - 15.0 - - reject - greylist:4 - add_header:8 - - - - - MISSING_SUBJECT - - FORGED_OUTLOOK_TAGS - - FORGED_SENDER - - SUSPICIOUS_RECIPS - - FAKE_REPLY_C - - MIME_HTML_ONLY - - FORGED_MSGID_YAHOO - - FORGED_MUA_THEBAT_BOUN - - R_MISSING_CHARSET - - RCVD_DOUBLE_IP_SPAM - - FORGED_OUTLOOK_HTML - - R_UNDISC_RCPT - - R_WHITE_ON_WHITE - - HTML_SHORT_LINK_IMG_2 - - FORGED_MUA_OUTLOOK - - FORGED_MUA_OUTLOOK_MAILLIST - - - SUSPICIOUS_BOUNDARY - - SUSPICIOUS_BOUNDARY2 - - SUSPICIOUS_BOUNDARY3 - - SUSPICIOUS_BOUNDARY4 - - - FORGED_MUA_THEBAT_MSGID - - FORGED_MUA_THEBAT_MSGID_UNKNOWN - - - FORGED_MUA_KMAIL_MSGID - - FORGED_MUA_KMAIL_MSGID_UNKNOWN - - - FORGED_MUA_OPERA_MSGID - - SUSPICIOUS_OPERA_10W_MSGID - - - FORGED_MUA_MOZILLA_MAIL_MSGID - - FORGED_MUA_MOZILLA_MAIL_MSGID_UNKNOWN - - FORGED_MUA_THUNDERBIRD_MSGID - - FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN - - FORGED_MUA_SEAMONKEY_MSGID - - FORGED_MUA_SEAMONKEY_MSGID_UNKNOWN - - - FM_FAKE_HELO_VERIZON - - REPTO_QUOTE_YAHOO - - MISSING_MIMEOLE - - MISSING_TO - - - FROM_EXCESS_BASE64 - - FROM_EXCESS_QP - - TO_EXCESS_BASE64 - - TO_EXCESS_QP - - REPLYTO_EXCESS_BASE64 - - REPLYTO_EXCESS_QP - - CC_EXCESS_BASE64 - - CC_EXCESS_QP - - - R_MIXED_CHARSET - - SORTED_RECIPS - - R_RCVD_SPAMBOTS - - R_TO_SEEMS_AUTO - - SUBJECT_NEEDS_ENCODING - - TRACKER_ID - - R_NO_SPACE_IN_FROM - - R_SAJDING - - R_BAD_CTE_7BIT - - R_FLASH_REDIR_IMGSHACK - - INVALID_MSGID - - MISSING_MID - - FORGED_RECIPIENTS - - FORGED_RECIPIENTS_MAILLIST - - RATWARE_MS_HASH - - STOX_REPLY_TYPE - - R_IP_PBL - - ONCE_RECEIVED - - ONCE_RECEIVED_STRICT - - RECEIVED_RBL - - R_PARTS_DIFFER - - MIME_HEADER_CTYPE_ONLY - - R_EMPTY_IMAGE - - - DRUGS_MANYKINDS - - DRUGS_ANXIETY - DRUGS_MUSCLE - DRUGS_ANXIETY_EREC - DRUGS_DIET - DRUGS_ERECTILE - - - ADVANCE_FEE_2 - ADVANCE_FEE_3 - - - R_LOTTO - - - BAYES_SPAM - BAYES_HAM - - - R_FUZZY - R_FUZZY_DENIED - R_FUZZY_PROB - R_FUZZY_WHITE - - - R_DKIM_REJECT - R_DKIM_TEMPFAIL - R_DKIM_ALLOW - - - R_SPF_FAIL - R_SPF_SOFTFAIL - R_SPF_ALLOW - - - MAILLIST - - - - PH_SURBL_MULTI - - OB_SURBL_MULTI - - AB_SURBL_MULTI - - SC_SURBL_MULTI - - JP_SURBL_MULTI - - WS_SURBL_MULTI - - - RAMBLER_URIBL - - - DBL - - - RAMBLER_EMAILBL - - - PHISHING - - - HEADER_FROM_DELIMITER_TAB - HEADER_TO_DELIMITER_TAB - HEADER_CC_DELIMITER_TAB - HEADER_REPLYTO_DELIMITER_TAB - HEADER_DATE_DELIMITER_TAB - - - HEADER_FROM_EMPTY_DELIMITER - HEADER_TO_EMPTY_DELIMITER - HEADER_CC_EMPTY_DELIMITER - HEADER_REPLYTO_EMPTY_DELIMITER - HEADER_DATE_EMPTY_DELIMITER - - - RCVD_ILLEGAL_CHARS - FAKE_RECEIVED_mail_ru - FAKE_RECEIVED_smtp_yandex_ru - FORGED_GENERIC_RECEIVED - FORGED_GENERIC_RECEIVED2 - FORGED_GENERIC_RECEIVED3 - FORGED_GENERIC_RECEIVED4 - FORGED_GENERIC_RECEIVED5 - INVALID_POSTFIX_RECEIVED - INVALID_EXIM_RECEIVED - INVALID_EXIM_RECEIVED2 - - - DATE_IN_FUTURE - DATE_IN_PAST - - - - -FORGED_RECIPIENTS & -MAILLIST -FORGED_MUA_OUTLOOK & -MAILLIST - - - - - - controller - localhost:11334 - 1 - 2048 - - q1 - - - normal - *:11333 - 2048 - - - - - webui - 1 - localhost:11336 - - q1 - - - - - - - - highsecure.ru:11335 - R_FUZZY - 300 - 10 - application/pdf - 1:R_FUZZY_DENIED:10,2:R_FUZZY_PROB:5,3:R_FUZZY_WHITE:-2.1 - - - - - - FORGED_SENDER - FORGED_RECIPIENTS - - - - - MAILLIST - - - - - file://@ETC_PREFIX@/rspamd/surbl-whitelist.inc - file://@ETC_PREFIX@/rspamd/2tld.inc - JP - AB - OB - PH - WS - SC - uribl.rambler.ru - - dbl.spamhaus.org - - noip - - - - - - - RECEIVED_RBL - pbl.spamhaus.org - xbl.spamhaus.org - insecure-bl.rambler.ru - - - - - - - - - 0.3 - R_MIXED_CHARSET - - - - - mail - static - dynamic - ONCE_RECEIVED_STRICT - ONCE_RECEIVED - - - - - - type = dnsbl, map = pbl.spamhaus.org, symbol = R_IP_PBL, description = PBL dns block list - - - - - PHISHING - - - - - - - - - - symbol = RAMBLER_EMAILBL, dnsbl = email-bl.rambler.ru, domain_only = false - - - - - - 2048 - 1d - - - - - - 2048 - 1d - - - - - - - - 1m - - - no - - - no - - - - - - - - - - - to:100:0.033333333 - - to_ip:30:0.025 - - to_ip_from:20:0.01666666667 - - - bounce_to:10:0.000555556 - - bounce_to_ip:5:0.000277778 - - - - - - postmaster,mailer-daemon - - - 5 - - - - - - 1M - - - - - - - - - - - - - - osb-text - default - 10 - 1000 - - BAYES_HAM - 20M - @LOCALSTATES_PREFIX@/bayes.ham - - - BAYES_SPAM - 20M - @LOCALSTATES_PREFIX@/bayes.spam - - - - - - - - - - - @ETC_PREFIX@/rspamd/plugins/lua/ - - - - diff --git a/src/cfg_rcl.c b/src/cfg_rcl.c index e5d721305..af4fbda93 100644 --- a/src/cfg_rcl.c +++ b/src/cfg_rcl.c @@ -51,7 +51,7 @@ rspamd_rcl_logging_handler (struct config_file *cfg, ucl_object_t *obj, return FALSE; } cfg->log_type = RSPAMD_LOG_FILE; - cfg->log_file = memory_pool_strdup (cfg->cfg_pool, ucl_object_tostring (val)); + cfg->log_file = rspamd_expand_path (cfg->cfg_pool, ucl_object_tostring (val)); } else if (g_ascii_strcasecmp (log_type, "syslog") == 0) { /* Need to get facility */ -- 2.39.5