aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/imspector/imspector.inc6
-rw-r--r--packages/imspector/imspector.xml36
-rw-r--r--pkg_config.xml4
3 files changed, 6 insertions, 40 deletions
diff --git a/packages/imspector/imspector.inc b/packages/imspector/imspector.inc
index 9b81a1a4..3e7d6822 100644
--- a/packages/imspector/imspector.inc
+++ b/packages/imspector/imspector.inc
@@ -61,7 +61,7 @@
function sync_package_imspector() {
global $config;
global $input_errors;
- $configfile = "/usr/local/etc/imspector.conf";
+ $configfile = "/usr/local/etc/imspector/imspector.conf";
$proto="";
$pf_rules="";
@@ -120,7 +120,7 @@
$configtext .= "file_logging_dir=/var/log/imspector\n";
if(imspector_config("filter_badwords"))
- $configtext .= "badwords_filename=/usr/local/etc/imspector.badwords\n";
+ $configtext .= "badwords_filename=/usr/local/etc/imspector/badwords.txt\n";
if(imspector_config("log_mysql"))
{
@@ -129,7 +129,7 @@
$configtext .= "mysql_username=".imspector_config("mysql_username")."\n";
$configtext .= "mysql_password=".imspector_config("mysql_password")."\n";
}
-
+
write_imspector_config($configfile,$configtext);
$stop = <<<EOD
diff --git a/packages/imspector/imspector.xml b/packages/imspector/imspector.xml
index 8757e2f8..e43bf63a 100644
--- a/packages/imspector/imspector.xml
+++ b/packages/imspector/imspector.xml
@@ -17,21 +17,6 @@
<chmod>0755</chmod>
<item>http://www.pfsense.org/packages/config/imspector/imspector.inc</item>
</additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/sbin/</prefix>
- <chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/imspector/sbin/imspector</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/etc/</prefix>
- <chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/imspector/imspector.badwords</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/lib/</prefix>
- <chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/imspector/lib/libimspector.so</item>
- </additional_files_needed>
<service>
<name>imspector</name>
<rcfile>imspector.sh</rcfile>
@@ -112,28 +97,9 @@
sync_package_imspector();
</custom_php_resync_config_command>
<custom_php_install_command>
- exec("mkdir -p /usr/local/lib/imspector");
- exec("fetch -o /usr/local/lib/imspector/debugloggingplugin.so \
- http://www.pfsense.com/packages/config/imspector/lib/debugloggingplugin.so");
- exec("fetch -o /usr/local/lib/imspector/fileloggingplugin.so \
- http://www.pfsense.com/packages/config/imspector/lib/fileloggingplugin.so");
- exec("fetch -o /usr/local/lib/imspector/mysqlloggingplugin.so \
- http://www.pfsense.com/packages/config/imspector/lib/mysqlloggingplugin.so");
- exec("fetch -o /usr/local/lib/imspector/icqprotocolplugin.so \
- http://www.pfsense.com/packages/config/imspector/lib/icqprotocolplugin.so");
- exec("fetch -o /usr/local/lib/imspector/ircprotocolplugin.so \
- http://www.pfsense.com/packages/config/imspector/lib/ircprotocolplugin.so");
- exec("fetch -o /usr/local/lib/imspector/msnprotocolplugin.so \
- http://www.pfsense.com/packages/config/imspector/lib/msnprotocolplugin.so");
- exec("fetch -o /usr/local/lib/imspector/yahooprotocolplugin.so \
- http://www.pfsense.com/packages/config/imspector/lib/yahooprotocolplugin.so");
- exec("fetch -o /usr/local/lib/imspector/badwordscontentplugin.so \
- http://www.pfsense.com/packages/config/imspector/lib/badwordscontentplugin.so");
- exec("chmod 755 /usr/local/lib/imspector/*");
+ sync_package_imspector();
</custom_php_install_command>
<custom_php_deinstall_command>
exec("rm -f /usr/local/etc/rc.d/imspector*");
- exec("rm -f /usr/local/etc/imspector.conf");
- exec("rm -rf /usr/local/lib/imspector");
</custom_php_deinstall_command>
</packagegui>
diff --git a/pkg_config.xml b/pkg_config.xml
index f643a5a8..6b676f1d 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -151,8 +151,8 @@
<status>ALPHA</status>
<config_file>http://www.pfsense.com/packages/config/imspector/imspector.xml</config_file>
<configurationfile>imspector.xml</configurationfile>
- <depends_on_package_base_url>ftp://ftp2.freebsd.org/pub/FreeBSD/ports/i386/packages-6.1-release/All</depends_on_package_base_url>
- <depends_on_package>mysql-client-5.1.6_1.tbz</depends_on_package>
+ <depends_on_package_base_url>http://pfsense.com/packages/All/</depends_on_package_base_url>
+ <depends_on_package>imspector-0.2.tbz</depends_on_package>
</package>
<package>
<name>nut</name>