From de641bf6c9976bb99b7c9cff18b04ed809a9bb6c Mon Sep 17 00:00:00 2001 From: kev Date: Thu, 6 Jun 2019 08:36:40 +0800 Subject: [PATCH] update tinc --- tinc/Dockerfile | 4 ++-- tinc/README.md | 10 +++++++--- tinc/docker-compose.yml | 4 ++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tinc/Dockerfile b/tinc/Dockerfile index baba6c0..9f2cef5 100644 --- a/tinc/Dockerfile +++ b/tinc/Dockerfile @@ -18,9 +18,9 @@ ENV NETNAME=netname \ VERBOSE=2 ENV IP_ADDR=1.2.3.4 \ - ADDRESS=10.0.0.1 \ + ADDRESS=10.20.30.1 \ NETMASK=255.255.255.0 \ - NETWORK=10.0.0.0/24 \ + NETWORK=10.20.30.0/24 \ RUNMODE=server EXPOSE 655/tcp 655/udp diff --git a/tinc/README.md b/tinc/README.md index 76cd8e0..b673119 100644 --- a/tinc/README.md +++ b/tinc/README.md @@ -36,6 +36,10 @@ tinc: - ./tinc:/etc/tinc environment: - IP_ADDR=1.2.3.4 + - ADDRESS=10.20.30.1 + - NETMASK=255.255.255.0 + - NETWORK=10.20.30.0/24 + - RUNMODE=server cap_add: - NET_ADMIN dns: 8.8.8.8 @@ -88,7 +92,7 @@ Interface = tun0 ConnectTo = server $ cat > /etc/tinc/netname/hosts/linkit -Subnet = 10.0.0.125 +Subnet = 10.20.30.125 $ tincd -n netname -K < /dev/null Generating 2048 bits keys: @@ -99,11 +103,11 @@ Done. $ cat > /etc/tinc/netname/tinc-up #!/bin/sh ip link set $INTERFACE up -ip addr add 10.0.0.125/24 dev $INTERFACE +ip addr add 10.20.30.125/24 dev $INTERFACE $ cat > /etc/tinc/netname/tinc-down #!/bin/sh -ip addr del 10.0.0.125/24 dev $INTERFACE +ip addr del 10.20.30.125/24 dev $INTERFACE ip link set $INTERFACE down $ cat > /etc/tinc/netname/hosts/server-up diff --git a/tinc/docker-compose.yml b/tinc/docker-compose.yml index 4159daa..31eb7f7 100644 --- a/tinc/docker-compose.yml +++ b/tinc/docker-compose.yml @@ -7,6 +7,10 @@ tinc: - ./tinc:/etc/tinc environment: - IP_ADDR=1.2.3.4 + - ADDRESS=10.20.30.1 + - NETMASK=255.255.255.0 + - NETWORK=10.20.30.0/24 + - RUNMODE=server cap_add: - NET_ADMIN dns: 8.8.8.8