Fixup a bunch of package service descriptions.

25 files changed, 25 insertions, 23 deletions

diff --git a/config/apache_mod_security/apache_mod_security.xml b/config/apache_mod_security/apache_mod_security.xml
index ada5a29c..b2162803 100644
--- a/config/apache_mod_security/apache_mod_security.xml
+++ b/config/apache_mod_security/apache_mod_security.xml
@@ -221,6 +221,7 @@
 		<name>apache_mod_security</name>
 		<rcfile>/usr/local/etc/rc.d/apache_mod_security.sh</rcfile>
 		<executable>httpd</executable>
+		<description>HTTP Daemon with mod_security</description>
 	</service>
 	<custom_php_resync_config_command>
 		apache_mod_security_resync();
diff --git a/config/avahi/avahi.xml b/config/avahi/avahi.xml
index 46f1293b..ef4fd961 100644
--- a/config/avahi/avahi.xml
+++ b/config/avahi/avahi.xml
@@ -47,6 +47,7 @@
 		<name>avahi</name>
 		<rcfile>avahi-daemon.sh</rcfile>
 		<executable>avahi-daemon</executable>
+		<description>Avahi zeroconf/mDNS daemon</description>
 	</service>
 	<fields>
 		<field>
diff --git a/config/bandwidthd/bandwidthd.xml b/config/bandwidthd/bandwidthd.xml
index 1603e385..d0753a01 100644
--- a/config/bandwidthd/bandwidthd.xml
+++ b/config/bandwidthd/bandwidthd.xml
@@ -60,6 +60,7 @@
 			<name>bandwidthd</name>
 			<rcfile>bandwidthd.sh</rcfile>
 			<executable>bandwidthd</executable>
+			<description>BandwidthD bandwidth monitoring daemon</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/blinkled/blinkled.xml b/config/blinkled/blinkled.xml
index b23c4dfc..d1141dbd 100644
--- a/config/blinkled/blinkled.xml
+++ b/config/blinkled/blinkled.xml
@@ -20,6 +20,7 @@
 		<name>blinkled</name>
 		<rcfile>blinkled.sh</rcfile>
 		<executable>blinkled</executable>
+		<description>Blinks LEDs to indicate network activity</description>
 	</service>
 	<fields>
 		<field>
diff --git a/config/blinkled8/blinkled.xml b/config/blinkled8/blinkled.xml
index 310d3810..298ba42e 100644
--- a/config/blinkled8/blinkled.xml
+++ b/config/blinkled8/blinkled.xml
@@ -25,6 +25,7 @@
 		<name>blinkled</name>
 		<rcfile>blinkled.sh</rcfile>
 		<executable>blinkled</executable>
+		<description>Blinks LEDs to indicate network activity</description>
 	</service>
 	<fields>
 		<field>
diff --git a/config/cron/cron.xml b/config/cron/cron.xml
index 4110090f..71e524b3 100644
--- a/config/cron/cron.xml
+++ b/config/cron/cron.xml
@@ -55,7 +55,7 @@
 		<name>cron</name>
 		<rcfile>cron.sh</rcfile>
 		<executable>cron</executable>
-		<description>The cron utility is used to manage commands on a schedule.</description>
+		<description>Scheduled commands daemon</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/darkstat/darkstat.xml b/config/darkstat/darkstat.xml
index c90b33cd..3263012b 100644
--- a/config/darkstat/darkstat.xml
+++ b/config/darkstat/darkstat.xml
@@ -58,6 +58,7 @@
 		<name>darkstat</name>
 		<rcfile>darkstat.sh</rcfile>
 		<executable>darkstat</executable>
+		<description>Darkstat bandwidth monitoring daemon</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/gwled/gwled.xml b/config/gwled/gwled.xml
index f1d065a2..35df41ee 100644
--- a/config/gwled/gwled.xml
+++ b/config/gwled/gwled.xml
@@ -25,6 +25,7 @@
 		<name>gwled</name>
 		<rcfile>gwled.sh</rcfile>
 		<executable>gwled</executable>
+		<description>Gateway LED Indicator Daemon</description>
 	</service>
 	<fields>
 		<field>
diff --git a/config/iperf.xml b/config/iperf.xml
index e5de8b85..2fe49699 100644
--- a/config/iperf.xml
+++ b/config/iperf.xml
@@ -59,6 +59,7 @@
 	<service>
                 <name>iperf</name>
                 <executable>iperf</executable>
+		<description>iperf network performance testing daemon/client</description>
         </service>
 	<tabs>
 		<tab>
diff --git a/config/ntop/ntop.xml b/config/ntop/ntop.xml
index 3b50c847..b635ef1f 100644
--- a/config/ntop/ntop.xml
+++ b/config/ntop/ntop.xml
@@ -64,6 +64,7 @@
 		<name>ntop</name>
 		<rcfile>ntop.sh</rcfile>
 		<executable>ntop</executable>
+		<description>NTOP bandwidth monitoring/graphing</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/ntop2/ntop.xml b/config/ntop2/ntop.xml
index 898df4d7..4db9e9c8 100644
--- a/config/ntop2/ntop.xml
+++ b/config/ntop2/ntop.xml
@@ -60,6 +60,7 @@
 		<name>ntop</name>
 		<rcfile>ntop.sh</rcfile>
 		<executable>ntop</executable>
+		<description>NTOP bandwidth monitoring/graphing</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/nut/nut.xml b/config/nut/nut.xml
index 9600beff..4a9c3d46 100644
--- a/config/nut/nut.xml
+++ b/config/nut/nut.xml
@@ -61,6 +61,7 @@
 		<name>nut</name>
 		<rcfile>nut.sh</rcfile>
 		<executable>upsmon</executable>
+		<description>UPS monitoring daemon</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/openbgpd/openbgpd.xml b/config/openbgpd/openbgpd.xml
index 58107d48..73bda244 100644
--- a/config/openbgpd/openbgpd.xml
+++ b/config/openbgpd/openbgpd.xml
@@ -49,6 +49,7 @@
     <name>bgpd</name>
     <rcfile>bgpd.sh</rcfile>
     <executable>bgpd</executable>
+	<description>OpenBSD BGP Daemon</description>
   </service>	
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
diff --git a/config/openospfd/openospfd.xml b/config/openospfd/openospfd.xml
index 278a91a0..ab948e7a 100644
--- a/config/openospfd/openospfd.xml
+++ b/config/openospfd/openospfd.xml
@@ -45,6 +45,7 @@
 		<name>OpenOSPFd</name>
 		<rcfile>ospfd.sh</rcfile>
 		<executable>ospfd</executable>
+		<description>OpenBSD OSPF Daemon</description>
 	</service>
 	<fields>
 		<field>
diff --git a/config/quagga_ospfd/quagga_ospfd.xml b/config/quagga_ospfd/quagga_ospfd.xml
index a03f9e3c..61bf3e94 100644
--- a/config/quagga_ospfd/quagga_ospfd.xml
+++ b/config/quagga_ospfd/quagga_ospfd.xml
@@ -50,11 +50,13 @@
 		<name>Quagga OSPFd</name>
 		<rcfile>quagga.sh</rcfile>
 		<executable>ospfd</executable>
+		<description>OSPF routing daemon</description>
 	</service>
 	<service>
 		<name>Quagga Zebra</name>
 		<rcfile>quagga.sh</rcfile>
 		<executable>zebra</executable>
+		<description>Quagga core/abstraction daemon</description>
 	</service>
 	<fields>
 		<field>
diff --git a/config/snort-dev/snort.xml b/config/snort-dev/snort.xml
index 4f687c9c..8f64a5e3 100644
--- a/config/snort-dev/snort.xml
+++ b/config/snort-dev/snort.xml
@@ -59,8 +59,7 @@
 		<name>snort</name>
 		<rcfile>snort.sh</rcfile>
 		<executable>snort</executable>
-		<description>Snort is the most widely deployed IDS/IPS technology
-			worldwide.</description>
+		<description>Snort IDS/IPS Daemon</description>
 	</service>
 	<tabs>
 	</tabs>
diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index ed731f74..ed71abae 100755
--- a/config/snort/snort.xml
+++ b/config/snort/snort.xml
@@ -59,7 +59,7 @@
 		<name>snort</name>
 		<rcfile>snort.sh</rcfile>
 		<executable>snort</executable>
-		<description>Snort is the most widely deployed IDS/IPS technology worldwide.</description>
+		<description>Snort IDS/IPS Daemon</description>
 	</service>
 	<tabs>
 	</tabs>
diff --git a/config/spamd/spamd.xml b/config/spamd/spamd.xml
index 83221d3d..76d39af9 100644
--- a/config/spamd/spamd.xml
+++ b/config/spamd/spamd.xml
@@ -56,6 +56,7 @@
                 <name>spamd</name>
                 <rcfile>spamd.sh</rcfile>
                 <executable>spamd</executable>
+		<description>SPAMD Greylisting Daemon</description>
         </service>
 	<tabs>
 		<tab>
diff --git a/config/tftp/tftp.xml b/config/tftp/tftp.xml
index 720ac212..d6becc6d 100644
--- a/config/tftp/tftp.xml
+++ b/config/tftp/tftp.xml
@@ -55,7 +55,7 @@
 		<name>tftp</name>
 		<rcfile>tftp.sh</rcfile>
 		<executable>inetd</executable>
-		<description>Trivial File Transport Protocol is a very simple file transfer protocol. Often used with routers, voip phones and more.</description>    
+		<description>TFTP daemon</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/tftp2/tftp.xml b/config/tftp2/tftp.xml
index 6fc6a08d..64f81acf 100644
--- a/config/tftp2/tftp.xml
+++ b/config/tftp2/tftp.xml
@@ -54,7 +54,7 @@
 	<service>
 		<name>tftp</name>
 		<executable>inetd</executable>
-		<description>Trivial File Transport Protocol is a very simple file transfer protocol. Often used with routers, voip phones and more.</description>    
+		<description>TFTP daemon</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/widget-snort/widget-snort.xml b/config/widget-snort/widget-snort.xml
index b415bd12..a6ea7f88 100644
--- a/config/widget-snort/widget-snort.xml
+++ b/config/widget-snort/widget-snort.xml
@@ -49,12 +49,6 @@
 	<version>0.3.4</version>
 	<title>Widget - Snort</title>
 	<include_file>/usr/local/www/widgets/include/widget-snort.inc</include_file>
-	<menu>
-	</menu>
-	<service>
-	</service>
-	<tabs>
-	</tabs>
 	<additional_files_needed>
 		<prefix>/usr/local/www/widgets/javascript/</prefix>
 		<chmod>0644</chmod>
@@ -70,14 +64,6 @@
 		<chmod>0644</chmod>
 		<item>http://www.pfsense.com/packages/config/widget-snort/widget-snort.inc</item>
 	</additional_files_needed>
-	<fields>
-	</fields>
-	<custom_add_php_command>
-	</custom_add_php_command>
-	<custom_php_resync_config_command>
-	</custom_php_resync_config_command>
-	<custom_php_install_command>
-	</custom_php_install_command>
 	<custom_php_deinstall_command>
 		widget_snort_uninstall();
 	</custom_php_deinstall_command>
diff --git a/config/zabbix-agent/zabbix-agent.xml b/config/zabbix-agent/zabbix-agent.xml
index 02147989..885a54e3 100644
--- a/config/zabbix-agent/zabbix-agent.xml
+++ b/config/zabbix-agent/zabbix-agent.xml
@@ -17,7 +17,7 @@
 		<name>zabbix_agentd</name>
 		<rcfile>zabbix_agentd.sh</rcfile>
 		<executable>zabbix_agentd</executable>
-		<description>Zabbix Agent runs on a host being monitored. The agent provides host's performance and availability information for Zabbix Server.</description>
+		<description>Zabbix Agent host monitor daemon</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/zabbix-proxy/zabbix-proxy.xml b/config/zabbix-proxy/zabbix-proxy.xml
index ff4011b0..19930b49 100644
--- a/config/zabbix-proxy/zabbix-proxy.xml
+++ b/config/zabbix-proxy/zabbix-proxy.xml
@@ -17,6 +17,7 @@
 		<name>zabbix-proxy</name>
 		<rcfile>zabbix-proxy.sh</rcfile>
 		<executable>zabbix_proxy</executable>
+		<description>Zabbix proxy collection daemon</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/zabbix2/zabbix2-agent.xml b/config/zabbix2/zabbix2-agent.xml
index 41ba26fb..55273a81 100644
--- a/config/zabbix2/zabbix2-agent.xml
+++ b/config/zabbix2/zabbix2-agent.xml
@@ -61,7 +61,7 @@
 		<name>zabbix_agentd</name>
 		<rcfile>zabbix2_agentd.sh</rcfile>
 		<executable>zabbix_agentd</executable>
-		<description>Zabbix Agent runs on a host being monitored. The agent provides host's performance and availability information for Zabbix Server.</description>
+		<description>Zabbix Agent host monitor daemon</description>
 	</service>
 	<tabs>
 		<tab>
diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml
index 4441df99..fcabedd9 100644
--- a/config/zabbix2/zabbix2-proxy.xml
+++ b/config/zabbix2/zabbix2-proxy.xml
@@ -61,7 +61,7 @@
 		<name>zabbix-proxy</name>
 		<rcfile>zabbix2_proxy.sh</rcfile>
 		<executable>zabbix_proxy</executable>
-		<description>Zabbix proxy is a process which collects performance and availability data from one or more monitored devices and sends the information to a Zabbix server</description>
+		<description>Zabbix proxy collection daemon</description>
 	</service>
 	<tabs>
 		<tab>