Merge pull request #1121 from doktornotor/patch-5

3 files changed, 58 insertions, 11 deletions

diff --git a/config/tinc/tinc.priv.inc b/config/tinc/tinc.priv.inc
new file mode 100644
index 00000000..d8b45c5b
--- /dev/null
+++ b/config/tinc/tinc.priv.inc
@@ -0,0 +1,44 @@
+<?php
+/*
+	tinc.priv.inc
+	part of pfSense (http://www.pfSense.org/)
+	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:
+
+	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.
+
+	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.
+*/
+global $priv_list;
+
+$priv_list['page-vpn-tinc'] = array();
+$priv_list['page-vpn-tinc']['name'] = "WebCfg - VPN: tinc package";
+$priv_list['page-vpn-tinc']['descr'] = "Allow access to tinc package GUI";
+$priv_list['page-vpn-tinc']['match'] = array();
+
+$priv_list['page-vpn-tinc']['match'][] = "pkg.php?xml=tinc.xml*";
+$priv_list['page-vpn-tinc']['match'][] = "pkg.php?xml=tinc_hosts.xml*";
+
+$priv_list['page-vpn-tinc']['match'][] = "pkg_edit.php?xml=tinc.xml*";
+$priv_list['page-vpn-tinc']['match'][] = "pkg_edit.php?xml=tinc_hosts.xml*";
+
+$priv_list['page-vpn-tinc']['match'][] = "status_tinc.php*";
+
+?>
diff --git a/config/tinc/tinc.xml b/config/tinc/tinc.xml
index 89d1e8ce..0f71e03d 100644
--- a/config/tinc/tinc.xml
+++ b/config/tinc/tinc.xml
@@ -42,8 +42,8 @@
 	</copyright>
 	<description>A self-contained VPN solution designed to connect multiple sites together in a secure way.</description>
 	<name>tinc</name>
-	<version>1.2.2</version>
-	<title>VPN: tinc - Config</title>
+	<version>1.2.4</version>
+	<title>VPN: Tinc: Settings</title>
 	<include_file>/usr/local/pkg/tinc.inc</include_file>
 	<configpath>['installedpackages']['package']['$packagename']['config']</configpath>
 	<menu>
@@ -53,7 +53,7 @@
 		<url>/pkg_edit.php?xml=tinc.xml</url>
 	</menu>
 	<menu>
-		<name>tinc VPN</name>
+		<name>Tinc VPN</name>
 		<section>Status</section>
 		<url>/status_tinc.php</url>
 	</menu>
@@ -65,7 +65,7 @@
 	</service>
 	<tabs>
 		<tab>
-			<text>Config</text>
+			<text>Settings</text>
 			<url>/pkg_edit.php?xml=tinc.xml</url>
 			<active/>
 		</tab>
@@ -79,6 +79,10 @@
 		<item>https://packages.pfsense.org/packages/config/tinc/tinc.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/tinc/tinc.priv.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/tinc/tinc_hosts.xml</item>
 	</additional_files_needed>
@@ -119,7 +123,7 @@
 			<fieldname>localip</fieldname>
 			<description>
 				<![CDATA[
-				IP Address of local tunnel interface.<br />
+				IP address of local tunnel interface.<br />
 				This is often the same IP as your routers LAN address. (Example: 192.168.2.1)
 				]]>
 			</description>
@@ -143,7 +147,7 @@
 			<fieldname>vpnnetmask</fieldname>
 			<description>
 				<![CDATA[
-				This is the Netmask that defines what traffic is routed to the VPNs tunnel interface.<br />
+				This is the netmask that defines what traffic is routed to the VPNs tunnel interface.<br />
 				It is usually broader then your local netmask. (Example: 255.255.0.0)
 				]]>
 			</description>
diff --git a/config/tinc/tinc_hosts.xml b/config/tinc/tinc_hosts.xml
index b521d4a2..a10c1a9e 100644
--- a/config/tinc/tinc_hosts.xml
+++ b/config/tinc/tinc_hosts.xml
@@ -41,13 +41,13 @@
 	]]>
 	</copyright>
 	<name>tinchosts</name>
-	<version>1.2.2</version>
-	<title>VPN: tinc - Hosts</title>
+	<version>1.2.4</version>
+	<title>VPN: Tinc: Hosts</title>
 	<include_file>/usr/local/pkg/tinc.inc</include_file>
 	<configpath>['installedpackages']['package']['$packagename']['config']</configpath>
 	<tabs>
 		<tab>
-			<text>Config</text>
+			<text>Settings</text>
 			<url>/pkg_edit.php?xml=tinc.xml</url>
 		</tab>
 		<tab>
@@ -75,7 +75,6 @@
 			<fieldname>connect</fieldname>
 			<type>checkbox</type>
 		</columnitem>
-
 	</adddeleteeditpagefields>
 	<fields>
 		<field>
@@ -107,7 +106,7 @@
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fielddescr>RSA public key</fielddescr>
+			<fielddescr>RSA Public Key</fielddescr>
 			<fieldname>cert_pub</fieldname>
 			<description>
 				<![CDATA[