Added sample configuration directory.

diff --git a/doc/sample-config/hosts/alpha b/doc/sample-config/hosts/alpha
new file mode 100644 (file)
index 0000000..95315e1
--- /dev/null
+++ b/doc/sample-config/hosts/alpha
@@ -0,0 +1,13 @@
+# Sample host configuration file
+
+# The real IP address of this tinc host. Can be used by other tinc hosts.
+Address = 123.234.35.67
+
+# Portnumber for incoming connections. Default is 655.
+Port = 655
+
+# Subnet on the virtual private network that is local for this host.
+Subnet = 192.168.1.0/24
+
+# The file in which the public key for this host is stored. Required.
+PublicKeyFile = /etc/tinc/example/hosts/alpha.key

diff --git a/doc/sample-config/hosts/alpha.key b/doc/sample-config/hosts/alpha.key
new file mode 100644 (file)
index 0000000..ac13536
--- /dev/null
+++ b/doc/sample-config/hosts/alpha.key
@@ -0,0 +1 @@
+# Generate this file with `tincd -n example -K`

diff --git a/doc/sample-config/hosts/beta b/doc/sample-config/hosts/beta
new file mode 100644 (file)
index 0000000..9e357b2
--- /dev/null
+++ b/doc/sample-config/hosts/beta
@@ -0,0 +1,14 @@
+# Sample host configuration file
+# This file was generated by host beta.
+
+# The real IP address of this tinc host. Can be used by other tinc hosts.
+Address = 123.45.67.189
+
+# Portnumber for incoming connections. Default is 655.
+Port = 6500
+
+# Subnet on the virtual private network that is local for this host.
+Subnet = 192.168.2.0/24
+
+# The file in which the public key for this host is stored. Required.
+PublicKeyFile = /etc/tinc/example/hosts/beta.key

diff --git a/doc/sample-config/hosts/beta.key b/doc/sample-config/hosts/beta.key
new file mode 100644 (file)
index 0000000..4470b70
--- /dev/null
+++ b/doc/sample-config/hosts/beta.key
@@ -0,0 +1 @@
+# This file has not been generated by this host, but by beta.

diff --git a/doc/sample-config/rsa_key.priv b/doc/sample-config/rsa_key.priv
new file mode 100644 (file)
index 0000000..ac13536
--- /dev/null
+++ b/doc/sample-config/rsa_key.priv
@@ -0,0 +1 @@
+# Generate this file with `tincd -n example -K`

diff --git a/doc/sample-config/tinc-down b/doc/sample-config/tinc-down
new file mode 100644 (file)
index 0000000..9f3b499
--- /dev/null
+++ b/doc/sample-config/tinc-down
@@ -0,0 +1,7 @@
+#!/bin/sh
+# This file closes down the tap device.
+# Note that if you use the universal tun/tap driver, you don't
+# need to do anything; once tinc quits the tap device is already
+# removed by the kernel.
+
+ifconfig tap0 down

diff --git a/doc/sample-config/tinc-up b/doc/sample-config/tinc-up
new file mode 100644 (file)
index 0000000..98df763
--- /dev/null
+++ b/doc/sample-config/tinc-up
@@ -0,0 +1,14 @@
+#!/bin/sh
+# This file sets up the tap device.
+# It gives you the freedom to do anything you want with it.
+# Use the correct name for the tap device:
+# For ethertap this is tap0, tap1, tap2 etcetera,
+# but for the universal tun/tap device use $NETNAME.
+
+# Set hardware ethernet address (required!)
+ifconfig tap0 hw ether fe:fd:0:0:0:0
+
+# Give it the right ip and netmask. Remember, the subnet of the
+# tap device must be larger than that of the individual Subnets
+# as defined in the host configuration file!
+ifconfig tap0 192.168.1.1 netmask 255.255.0.0 -arp

diff --git a/doc/sample-config/tinc.conf b/doc/sample-config/tinc.conf
new file mode 100644 (file)
index 0000000..ea5216e
--- /dev/null
+++ b/doc/sample-config/tinc.conf
@@ -0,0 +1,23 @@
+# Sample tinc configuration file
+
+# This is a comment.
+# Spaces and tabs are eliminated.
+# The = sign isn't strictly necessary any longer, though you may want
+# to leave it in as it improves readability :)
+# Variable names are treated case insensitive.
+
+# The name of this tinc host. Required.
+Name = alpha
+
+# The internet host to connect with.
+# Comment these out to make yourself a listen-only connection
+# You must use the name of another tinc host.
+# May be used multiple times for redundance.
+ConnectTo = beta
+
+# The tap device tinc will use. Required.
+# Default is /dev/tap0
+TapDevice = /dev/tap1
+
+# The file in which the private key for this host is stored. Required.
+PrivateKeyFile = /etc/tinc/example/rsa_key.priv

diff --git a/doc/tinc.conf.sample b/doc/tinc.conf.sample
deleted file mode 100644 (file)
index bbccc44..0000000
--- a/doc/tinc.conf.sample
+++ /dev/null
@@ -1,46 +0,0 @@
-# Sample tinc configuration file
-
-# This is a comment.
-# Spaces and tabs are eliminated.
-# The = sign isn't strictly necessary any longer, though you may want
-# to leave it in as it improves readability :)
-# Variable names are treated case insensitive.
-
-# The internet host to connect with
-# comment these out to make yourself a listen-only connection
-# You may use an IP address or its FQDN.
-ConnectTo = 1.2.3.4
-
-# Connect to which port of the `ConnectTo' host
-
-# It is advised that you only connect to ports that are < 1024,
-# because some malicious (non-root) user may run a fake tincd on ports
-# above 1024.
-# The default port is 655, the port that has been assigned to tinc
-# by the IANA. If you want tincd to listen on any other port than 655,
-# you can use ListenPort for the `server', and ConnectPort for the
-# `client'.
-
-# You may use the prefixes 0x or 0 to denote a hexadecimal or octal
-# number respectively.
-ConnectPort = 0x300
-
-# Listen on which port
-ListenPort = 200
-
-# My own VPN IP
-# You may use the /nn notation to indicate the number of bits used for
-# the mask, /8 is equivalent to the netmask 255.0.0.0 (the first 8
-# bits are set to 1).
-MyOwnVPNIP = 10.x.x.x/8
-
-# VPN Netmask
-# You'll need this option if you use the Debian or Redhat init
-# scripts.  Put in here a netmask that covers your entire VPN network;
-# it is used to set routes from the init script, tinc itself ignores
-# it.
-VpnMask = 255.255.0.0
-
-# Which local file?
-# Default is /dev/tap0
-TapDevice = /dev/tap1