Merging upstream version 20160401.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

3 files changed, 265 insertions, 0 deletions

diff --git a/share/doc/HOST-SETUP.txt b/share/doc/HOST-SETUP.txt
new file mode 100644
index 0000000..b8f4cd7
--- /dev/null
+++ b/share/doc/HOST-SETUP.txt
@@ -0,0 +1,169 @@
+container-tools: Host Setup
+===========================
+
+
+1. Debian Packages
+-------------------
+
+apt install bridge-utils ifenslave vlan
+
+
+2. Boot Parameters
+------------------
+
+2.1 CGroup Memory Controller
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to enable the memory controller the following boot parameter needs to be used:
+
+	cgroup_enable=memory
+
+
+2.2 CGroup Swap Controller
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to enable the swap controller the following boot parameter needs to be used:
+
+	swapaccount=1
+
+
+3. Networking
+~~~~~~~~~~~~~
+
+3.1 Enable IPv4 Forwarding
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+apt install procps
+echo "net.ipv4.ip_forward = 1" > /etc/sysctl.d/ip_foward.conf
+sysctl -p
+
+
+3.2 Configure Network Bridge
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+3.2.1 Bridge: 1 Interface, standalone, DHCP
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+cat > /etc/network/interfaces << EOF
+# /etc/network/interfaces
+
+auto lo
+iface lo inet loopback
+
+iface eth0 inet manual
+
+auto br0
+iface br0 inet dhcp
+	bridge_ports	eth0
+	bridge_fd	0
+	bridge_maxwait	0
+	bridge_stp	0
+EOF
+
+
+3.2.2 Bridge: 1 Interface, standalone, static
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+cat > /etc/network/interfaces << EOF
+# /etc/network/interfaces
+
+auto lo
+iface lo inet loopback
+
+iface eth0 inet manual
+
+auto br0
+iface br0 inet static
+	address		10.0.0.2
+	broadcast	10.0.0.255
+	gateway		10.0.0.1
+	netmask		255.255.255.0
+	network		10.0.0.0
+
+	pre-up		ifconfig eth0 down
+	pre-up		ifconfig eth0 up
+
+	bridge_ports	eth0
+	bridge_fd	0
+	bridge_maxwait	0
+	bridge_stp	0
+EOF
+
+
+3.2.3 Bridge: 2 logical Interfaces, subnet, static
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+cat > /etc/network/interfaces << EOF
+# /etc/network/interfaces
+
+auto lo
+iface lo inet loopback
+
+autho eth0
+iface eth0 inet dhcp
+
+auto br0
+iface br0 inet static
+	address		10.0.0.1
+	broadcast	10.0.0.255
+	netmask		255.255.255.0
+	network		10.0.0.0
+
+	pre-up		brctl addbr br0
+	post-down	brctl delbr br0
+
+	bridge_fd	0
+	bridge_maxwait	0
+	bridge_stp	0
+EOF
+
+
+3.2.4 Bridge: 3 physical Interfaces, vlan, bonding, static
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+cat > /etc/network/interfaces << EOF
+# /etc/network/interfaces
+
+auto lo
+iface lo inet loopback
+
+auto eth0
+iface eth0 inet dhcp
+
+iface eth1 inet manual
+
+iface eth2 inet manual
+
+auto bond0
+iface bond0 inet manual
+	up			ifconfig bond0 0.0.0.0 up
+	down			ifconfig bond0 down
+
+	slaves			eth1 eth2
+
+	bond-mode		4
+	bond-miimon		100
+	bond-downdelay		200
+	bond-updelay		200
+	bond-lacp-rate		1
+	bond-xmit-hash-policy	layer2+3
+
+iface bond0.100 inet manual
+	vlan-raw-device bond0
+
+auto br100
+iface br100 inet static
+	address			10.100.0.2
+	broadcast		10.100.0.255
+	#gateway		10.100.0.1
+	netmask			255.255.255.0
+	network			10.100.0.0
+
+	post-up			ip route add 10.100.0.0/24 via 10.100.0.1 dev br100
+	post-down		ip route del 147.87.226.0/24 dev br100
+
+	bridge_ports		bond0.100
+	bridge_fd		0
+	bridge_maxwait		0
+	bridge_stp		0
+EOF
diff --git a/share/doc/examples/cairon-backports.cfg b/share/doc/examples/cairon-backports.cfg
new file mode 100644
index 0000000..096cc5e
--- /dev/null
+++ b/share/doc/examples/cairon-backports.cfg
@@ -0,0 +1,64 @@
+# container-tools - Manage systemd-nspawn containers
+#
+# example for automated Progress Linux 3+ (cairon-backports) container creation
+# using: sudo container create -s progress-linux
+
+#container-tools cnt-debconf/preseed-files string 
+#container-tools cnt-debconf/include-preseed-files string 
+
+container-tools cnt-debconf/distribution select cairon-backports
+#container-tools cnt-debconf/parent-distribution select 
+
+container-tools cnt-debconf/architecture select auto
+
+container-tools cnt-debconf/archives multiselect cairon-security, cairon-updates, cairon-extras, cairon-backports, cairon-backports-extras
+#container-tools cnt-debconf/parent-archives multiselect 
+
+container-tools cnt-debconf/mirror string http://cdn.archive.progress-linux.org/packages
+container-tools cnt-debconf/mirror-security string http://cdn.archive.progress-linux.org/packages
+
+container-tools cnt-debconf/parent-mirror string http://httpredir.debian.org/debian
+container-tools cnt-debconf/parent-mirror-security string http://security.debian.org
+
+container-tools cnt-debconf/archive-areas multiselect main, contrib, non-free
+container-tools cnt-debconf/parent-archive-areas multiselect main, contrib, non-free
+
+container-tools cnt-debconf/packages string openssh-server
+
+container-tools cnt-debconf/root-password string progress
+#container-tools cnt-debconf/root-password-crypted string 
+
+# Network IP configuration
+container-tools cnt-debconf/network0/bridge string br0
+container-tools cnt-debconf/network0/ipv4-method select static
+container-tools cnt-debconf/network0/ipv4-comment string Primary network interfaces
+container-tools cnt-debconf/network0/ipv4-address string 192.168.0.2
+container-tools cnt-debconf/network0/ipv4-broadcast string 192.168.0.255
+container-tools cnt-debconf/network0/ipv4-gateway string 192.168.0.1
+container-tools cnt-debconf/network0/ipv4-netmask string 255.255.255.0
+container-tools cnt-debconf/network0/ipv4-network string 192.168.0.0
+#container-tools cnt-debconf/network0/ipv4-post-up string 
+#container-tools cnt-debconf/network0/ipv4-post-down string 
+
+# Network DNS configuration
+container-tools cnt-debconf/nameserver/server string 127.0.0.1 8.8.8.8 8.8.4.4
+container-tools cnt-debconf/nameserver/domain string example.net
+container-tools cnt-debconf/nameserver/search string example.net
+container-tools cnt-debconf/nameserver/options string timeout:1 attempts:1
+
+# Third-Party Repositories
+#container-tools cnt-debconf/archive0/repository string 
+#container-tools cnt-debconf/archive0/list string 
+#container-tools cnt-debconf/archive0/comment string 
+#container-tools cnt-debconf/archive0/source string 
+#container-tools cnt-debconf/archive0/key string 
+#container-tools cnt-debconf/archive0/preferences-package string 
+#container-tools cnt-debconf/archive0/preferences-pin string 
+#container-tools cnt-debconf/archive0/preferences-pin-priority 
+
+# Internal Options
+#container-tools cnt-debconf/apt-recommends string 
+#container-tools cnt-debconf/debconf-frontend string 
+#container-tools cnt-debconf/debconf-priority string 
+#container-tools cnt-debconf/container-command string 
+#container-tools cnt-debconf/host-command string 
diff --git a/share/doc/examples/jessie.cfg b/share/doc/examples/jessie.cfg
new file mode 100644
index 0000000..509b09e
--- /dev/null
+++ b/share/doc/examples/jessie.cfg
@@ -0,0 +1,32 @@
+# container-tools - Manage systemd-nspawn containers
+#
+# example for automated Debian 8 (jessie) based container creation
+# using: sudo container create -s debian
+
+#container-tools cnt-debconf/preseed-files string 
+#container-tools cnt-debconf/include-preseed-files string 
+
+container-tools cnt-debconf/distribution select jessie
+#container-tools cnt-debconf/parent-distribution select 
+
+container-tools cnt-debconf/architecture select auto
+
+container-tools cnt-debconf/archives multiselect jessie-security, jessie-updates
+#container-tools cnt-debconf/parent-archives multiselect 
+
+container-tools cnt-debconf/mirror string http://httpredir.debian.org/debian
+container-tools cnt-debconf/mirror-security string http://security.debian.org
+
+#container-tools cnt-debconf/parent-mirror string 
+#container-tools cnt-debconf/parent-mirror-security string 
+
+container-tools cnt-debconf/archive-areas multiselect main
+#container-tools cnt-debconf/parent-archive-areas multiselect 
+
+container-tools cnt-debconf/packages string openssh-server
+
+container-tools cnt-debconf/root-password string debian
+#container-tools cnt-debconf/root-password-crypted string 
+
+container-tools cnt-debconf/network-bridge string br0
+#container-tools cnt-debconf/network-mac string