diff options
| author | Ermal <eri@pfsense.org> | 2010-03-23 15:34:21 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-03-23 15:34:21 +0000 |
| commit | 399ca88cb617836fdbf08fd0288200ec74541c3f (patch) | |
| tree | a48c3eee5bbd021a35f2f8874f9bada9cbda62dc /config | |
| parent | bb9049d981971cf03fd39370ba7e14db549634fb (diff) | |
| download | pfsense-packages-399ca88cb617836fdbf08fd0288200ec74541c3f.tar.gz pfsense-packages-399ca88cb617836fdbf08fd0288200ec74541c3f.tar.bz2 pfsense-packages-399ca88cb617836fdbf08fd0288200ec74541c3f.zip | |
Enable spamd package on 2.0 fix several paths with the move of files to the new directory also unlink the previous configuration file before linking anew one.
Diffstat (limited to 'config')
| -rw-r--r-- | config/spamd/spamd.inc | 4 | ||||
| -rw-r--r-- | config/spamd/spamd.xml | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc index c33e589c..e6b89051 100644 --- a/config/spamd/spamd.inc +++ b/config/spamd/spamd.inc @@ -153,6 +153,7 @@ function sync_package_spamd() { log_error("Restart cron"); mwexec("killall -HUP cron"); log_error("Setting up spamd.conf symlink"); + mwexec("rm -f /usr/local/etc/spamd/spamd.conf"); mwexec("ln -s /etc/spamd.conf /usr/local/etc/spamd/spamd.conf"); log_error("Stopping spamd"); mwexec("/usr/local/etc/rc.d/spamd.sh stop"); @@ -245,7 +246,10 @@ function custom_php_install_command() { system("touch /var/db/whitelist.txt"); system("touch /var/db/blacklist.txt"); sync_package_spamd(); + conf_mount_rw(); exec("/usr/sbin/pw usermod _spamd -g proxy -G _spamd,proxy"); + exec("/bin/cp /usr/local/etc/spamd/spamd.conf.sample /usr/local/etc/spamd/spamd.conf"); + conf_mount_ro(); } function custom_php_deinstall_command() { diff --git a/config/spamd/spamd.xml b/config/spamd/spamd.xml index 5bbc5d71..b03cd737 100644 --- a/config/spamd/spamd.xml +++ b/config/spamd/spamd.xml @@ -95,42 +95,42 @@ <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd_rules.php</item> + <item>http://www.pfsense.com/packages/config/spamd/spamd_rules.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd_whitelist.xml</item> + <item>http://www.pfsense.com/packages/config/spamd/spamd_whitelist.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd_outlook.xml</item> + <item>http://www.pfsense.com/packages/config/spamd/spamd_outlook.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd.inc</item> + <item>http://www.pfsense.com/packages/config/spamd/spamd.inc</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd_settings.xml</item> + <item>http://www.pfsense.com/packages/config/spamd/spamd_settings.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd_db.php</item> + <item>http://www.pfsense.com/packages/config/spamd/spamd_db.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd_db_ext.php</item> + <item>http://www.pfsense.com/packages/config/spamd/spamd_db_ext.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/bin/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd_gather_stats.php</item> + <item>http://www.pfsense.com/packages/config/spamd/spamd_gather_stats.php</item> </additional_files_needed> <!-- fields gets invoked when the user adds or edits a item. the following items |