aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-02-26 19:54:30 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-02-26 19:54:30 +0000
commit98f8baada7f2a9ef4816b00455f88c2035600725 (patch)
treebaded57461fc4d8ffc7c5c4b509b14422e071a15
parent1b7ad79245cfdd235a1b4d5ab0093efc725dc278 (diff)
downloadpfsense-packages-98f8baada7f2a9ef4816b00455f88c2035600725.tar.gz
pfsense-packages-98f8baada7f2a9ef4816b00455f88c2035600725.tar.bz2
pfsense-packages-98f8baada7f2a9ef4816b00455f88c2035600725.zip
Clean up spamd.conf
-rw-r--r--packages/spamd.xml19
1 files changed, 9 insertions, 10 deletions
diff --git a/packages/spamd.xml b/packages/spamd.xml
index 2b831c82..f4a3a355 100644
--- a/packages/spamd.xml
+++ b/packages/spamd.xml
@@ -103,24 +103,23 @@
/* all header */
fwrite($fd, "# this file was automatically generated by the pfSense\n");
fwrite($fd, "# package management system\n\n");
- fwrite($fd, "all:whitelist:\\\n\t");
+ fwrite($fd, "all:\\\n\t:whitelist");
foreach($config['installedpackages']['spamd']['config'] as $spamd) {
- fwrite($fd, ":" . rtrim($spamd['provider_name']));
+ fwrite($fd, ":" . rtrim($spamd['providername']));
}
- fwrite($fd, "\n\n# begin of whitelist\n");
+ fwrite($fd, ":\n\n# begin of whitelist\n");
fwrite($fd, ":whitelist:\\ \n");
fwrite($fd, ":white:\\ \n");
- fwrite($fd, ":file=/var/mail/whitelist.txt\n\n");
+ fwrite($fd, ":file=/var/mail/whitelist.txt\n");
/* loop through each item and write out its configuration */
fwrite($fd, "\n# begin of user created entries\n");
foreach($config['installedpackages']['spamd']['config'] as $spamd) {
- fwrite($fd, rtrim($spamd['provider_name']) . ":\\ \n");
- fwrite($fd, ":" . rtrim($spamd['provider_method']) . ":\\ \n");
- fwrite($fd, ":msg=\"" . rtrim($spamd['reject_message']) . "\":\\ \n");
- fwrite($fd, ":" . rtrim($spamd['provider_method']) . ":\\ \n");
- fwrite($fd, ":file=" . rtrim($spamd['provider_url']) . ":\n\n");
+ fwrite($fd, rtrim($spamd['providername']) . ":\\ \n");
+ fwrite($fd, ":" . rtrim($spamd['providermethod']) . ":\\ \n");
+ fwrite($fd, ":msg=\"" . rtrim($spamd['rejectmessage']) . "\":\\ \n");
+ fwrite($fd, ":" . rtrim($spamd['providermethod']) . ":\\ \n");
+ fwrite($fd, ":file=" . rtrim($spamd['providerurl']) . ":\n\n");
}
- fwrite($fd, ":\n");
fclose($fd);
$fd = fopen("/var/mail/whitelist.txt","w");
if($config['installedpackages']['spamd-whitelist']['config'] != "")