aboutsummaryrefslogtreecommitdiffstats
path: root/config/avahi
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-08-11 10:42:16 +0200
committerdoktornotor <notordoktor@gmail.com>2015-08-11 10:42:16 +0200
commit692a3585dd0d60981fc7721b7effef16c063ebd1 (patch)
treec55509eeffabe9106321c981f54ea476aef876fa /config/avahi
parent268764e87ab8d2371542d8676f3bec3a4d436ce4 (diff)
downloadpfsense-packages-692a3585dd0d60981fc7721b7effef16c063ebd1.tar.gz
pfsense-packages-692a3585dd0d60981fc7721b7effef16c063ebd1.tar.bz2
pfsense-packages-692a3585dd0d60981fc7721b7effef16c063ebd1.zip
avahi - code style fixes
- Fix copyright header - Fix indentation - Fix permissions (none of these needs to be executable) - Make version sane and consistent - Hide WAN from 'Deny interfaces' selection because it's always disabled. Clarify the description note accordingly - Move custom_php_deinstall_command to avahi.inc and make it much more thorough
Diffstat (limited to 'config/avahi')
-rw-r--r--config/avahi/avahi.xml114
1 files changed, 65 insertions, 49 deletions
diff --git a/config/avahi/avahi.xml b/config/avahi/avahi.xml
index cd1d96ce..e0fcb6fb 100644
--- a/config/avahi/avahi.xml
+++ b/config/avahi/avahi.xml
@@ -1,40 +1,50 @@
<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
<packagegui>
<copyright>
- <![CDATA[
- /*
- $Id$
- avahi.xml
- part of pfSense (http://www.pfSense.com)
- Copyright (C) 2009 Scott Ullrich
- All rights reserved.
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
+/*
+ avahi.xml
+ part of pfSense (https://www.pfSense.org/)
+ Copyright (C) 2009 Scott Ullrich
+ Copyright (C) 2009-2013 Jim Pingle
+ Copyright (C) 2015 ESF, LLC
+ All rights reserved.
+*/
+/* ====================================================================================== */
+/*
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
- */
- ]]>
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ====================================================================================== */
+ ]]>
</copyright>
<title>Services: Avahi</title>
<name>avahi</name>
- <version>0.6.31 pkg v1.05</version>
+ <version>1.10.0</version>
<savetext>Save</savetext>
<include_file>/usr/local/pkg/avahi.inc</include_file>
<menu>
@@ -49,6 +59,18 @@
<executable>avahi-daemon</executable>
<description>Avahi zeroconf/mDNS daemon</description>
</service>
+ <additional_files_needed>
+ <prefix>/usr/local/pkg/</prefix>
+ <item>https://packages.pfsense.org/packages/config/avahi/avahi.inc</item>
+ </additional_files_needed>
+ <additional_files_needed>
+ <prefix>/usr/local/etc/avahi/</prefix>
+ <item>https://packages.pfsense.org/packages/config/avahi/services/ssh.service</item>
+ </additional_files_needed>
+ <additional_files_needed>
+ <prefix>/usr/local/etc/avahi/</prefix>
+ <item>https://packages.pfsense.org/packages/config/avahi/services/sftp-ssh.service</item>
+ </additional_files_needed>
<fields>
<field>
<fielddescr>Enable</fielddescr>
@@ -59,44 +81,40 @@
<field>
<fielddescr>Browse domains (comma separated)</fielddescr>
<fieldname>browsedomains</fieldname>
- <description>Enter the domains that you would like proxied. (example: local, pfsense.org, mydomain.com)</description>
+ <description>
+ <![CDATA[
+ Enter the domains that you would like proxied.<br />
+ (Example: local, pfsense.org, mydomain.com)
+ ]]>
+ </description>
<type>input</type>
</field>
<field>
<fielddescr>Deny interfaces</fielddescr>
<fieldname>denyinterfaces</fieldname>
- <description>Interfaces that you do NOT want Avahi to listen on. NOTE: WAN is always disabled.</description>
+ <description>
+ <![CDATA[
+ Interfaces that you do NOT want Avahi to listen on.
+ <strong>NOTE: WAN is always disabled (so it is not shown here).</strong>
+ ]]>
+ </description>
<type>interfaces_selection</type>
+ <hideinterfaceregex>wan</hideinterfaceregex>
<multiple>true</multiple>
</field>
<field>
<fielddescr>Disable IPv6</fielddescr>
<fieldname>disable_ipv6</fieldname>
- <description>Disable IPv6 support in Avahi</description>
+ <description>Disable IPv6 support in Avahi.</description>
<type>checkbox</type>
</field>
<field>
<fielddescr>Disable IPv4</fielddescr>
<fieldname>disable_ipv4</fieldname>
- <description>Disable IPv4 support in Avahi</description>
+ <description>Disable IPv4 support in Avahi.</description>
<type>checkbox</type>
</field>
</fields>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/avahi/avahi.inc</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/etc/avahi/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/avahi/services/ssh.service</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/etc/avahi/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/avahi/services/sftp-ssh.service</item>
- </additional_files_needed>
<custom_php_resync_config_command>
avahi_sync();
</custom_php_resync_config_command>
@@ -104,8 +122,6 @@
avahi_install();
</custom_php_install_command>
<custom_php_deinstall_command>
- unlink_if_exists("/usr/local/etc/rc.d/avahi-daemon.sh");
- exec("killall -9 avahi-daemon");
- exec("killall -9 dbus-daemon");
+ avahi_deinstall();
</custom_php_deinstall_command>
</packagegui>