Changes

no edit summary
Line 1,984: Line 1,984:  
       <td>Local address</td>
 
       <td>Local address</td>
 
       <td>ip; default: <b>none</b></td>
 
       <td>ip; default: <b>none</b></td>
       <td>IP address of device's WAN. Note: If left empty, it will take IP address automatically from main WAN interface. <td>
+
       <td>IP address of device's WAN. Note: If left empty, it will take IP address automatically from main WAN interface.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
Line 2,020: Line 2,020:  
       <td>Peer Tunnel ID</td>
 
       <td>Peer Tunnel ID</td>
 
       <td>integer [1..4294967295]; default: <b>none</b></td>
 
       <td>integer [1..4294967295]; default: <b>none</b></td>
       <td>ID of peer's tunnel is specified from 1 to 4294967295. It must match other end tunnel ID.<td>
+
       <td>ID of peer's tunnel is specified from 1 to 4294967295. It must match other end tunnel ID.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
Line 2,051: Line 2,051:  
       <td>IP Address</td>
 
       <td>IP Address</td>
 
       <td>ip; default: <b>none</b></td>
 
       <td>ip; default: <b>none</b></td>
       <td>IP address of standalone L2TPv3 interface.<td>
+
       <td>IP address of standalone L2TPv3 interface.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
Line 2,338: Line 2,338:     
'''Tinc''' is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Tinc is Free Software and licensed under the [https://www.gnu.org/licenses/old-licenses/gpl-2.0.html|GNU General Public License] version 2 or later. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others.
 
'''Tinc''' is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Tinc is Free Software and licensed under the [https://www.gnu.org/licenses/old-licenses/gpl-2.0.html|GNU General Public License] version 2 or later. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others.
 +
 +
<u><b>Note:</b> Tinc VPN is additional software that can be installed from the <b>System → [[{{{name}}} Package Manager|Package Manager]]</b> page.</u>
    
Tinc works by adding an interface which acts as Router/Switch/Hub mode. To create one enter its name and click the <b>Add</b> button. This should add a new Tinc interface and open a configuration window
 
Tinc works by adding an interface which acts as Router/Switch/Hub mode. To create one enter its name and click the <b>Add</b> button. This should add a new Tinc interface and open a configuration window
   −
[[File:Networking_rutx_vpn_tinc.png|border|class=tlt-border]]
+
[[File:Networking_rutx_vpn_tinc_v1.png|border|class=tlt-border]]
    
===General Interface Settings===
 
===General Interface Settings===
Line 2,349: Line 2,351:  
Private keys, specify Subnet and Host to Connect to for communication.
 
Private keys, specify Subnet and Host to Connect to for communication.
   −
[[File:Networking_rutx_vpn_tinc_instance_general.png|border|class=tlt-border]]
+
[[File:Networking_rutx_vpn_tinc_instance_general_v1.png|border|class=tlt-border]]
    
<table class="nd-mantable">
 
<table class="nd-mantable">
Line 2,359: Line 2,361:  
     <tr>
 
     <tr>
 
     <td>Enable</td>
 
     <td>Enable</td>
         <td>off | on; default: <b>off</b></td>
+
         <td>off {{!}} on; default: <b>off</b></td>
 
         <td>Turns Tinc Interface on or off.</td>
 
         <td>Turns Tinc Interface on or off.</td>
 
     </tr>
 
     </tr>
         <tr>
+
    <tr>
 +
    <td>Local tunnel endpoint IP</td>
 +
         <td>ipv4 with or without mask; default: <b>none</b></td>
 +
        <td>IP address of virtual local network interface.</td>
 +
    </tr>
 +
    <tr>
 +
    <td>Local tunnel endpoint IPv6</td>
 +
        <td>ipv6 with or without mask; default: <b>none</b></td>
 +
        <td>IPv6 address of virtual local network interface.</td>
 +
    </tr>
 +
    <tr>
 
     <td>Subnet</td>
 
     <td>Subnet</td>
         <td>ip; default: <b>none</b></td>
+
         <td>ip with subnet; default: <b>none</b></td>
         <td>The subnet which this tinc daemon will serve. Multiple subnet lines can be specified for each Daemon.</td>
+
         <td>Subnets that peers are allowed to access. You can add multiple subnet entries for each daemon.</td>
 
     </tr>
 
     </tr>
 
     <tr>
 
     <tr>
Line 2,379: Line 2,391:  
     <tr>
 
     <tr>
 
     <td>Host to Connect to</td>
 
     <td>Host to Connect to</td>
         <td>Not specified | Host name; default: <b>Not specified</b></td>
+
         <td>Not specified {{!}} Host name; default: <b>Not specified</b></td>
 
         <td>Specifies which other tinc daemon to connect to on startup. Multiple variables may be specified, in which case outgoing connections to each specified tinc daemon are made.</td>
 
         <td>Specifies which other tinc daemon to connect to on startup. Multiple variables may be specified, in which case outgoing connections to each specified tinc daemon are made.</td>
 
     </tr>  
 
     </tr>  
 
</table>
 
</table>
      
====Advanced Settings====
 
====Advanced Settings====