diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 01:35:06 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 02:11:48 +0200 |
commit | 1a64deeb894dc95e2645a75771732c6cc53a79ad (patch) | |
tree | 1b9df4838f894577a09b9b260151756272efeb53 /modules/private/vpn/tinc | |
parent | fa25ffd4583cc362075cd5e1b4130f33306103f0 (diff) | |
download | Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.gz Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.zst Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.zip |
Squash changes containing private information
There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository
Diffstat (limited to 'modules/private/vpn/tinc')
-rwxr-xr-x | modules/private/vpn/tinc/host-down | 7 | ||||
-rwxr-xr-x | modules/private/vpn/tinc/host-up | 11 | ||||
-rwxr-xr-x | modules/private/vpn/tinc/tinc-down | 12 | ||||
-rwxr-xr-x | modules/private/vpn/tinc/tinc-up | 14 | ||||
-rw-r--r-- | modules/private/vpn/tinc/tinc.conf | 11 |
5 files changed, 0 insertions, 55 deletions
diff --git a/modules/private/vpn/tinc/host-down b/modules/private/vpn/tinc/host-down deleted file mode 100755 index 1e79bd3..0000000 --- a/modules/private/vpn/tinc/host-down +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | |||
3 | SUBDOMAIN=$(echo "$NODE" | sed -e "s/\([A-Z][a-z0-9]*\)/\L\1 /g;" | awk '{ for (i=NF; i>1; i--) printf("%s.",$i); print $1; }') | ||
4 | NODEIPS=`getent hosts ${SUBDOMAIN}.immae.eu | cut -d' ' -f1 | tr "\\n" ' '` | ||
5 | for NODEIP in $NODEIPS; do | ||
6 | ip neigh del proxy $NODEIP dev @mainInterface@ | ||
7 | done | ||
diff --git a/modules/private/vpn/tinc/host-up b/modules/private/vpn/tinc/host-up deleted file mode 100755 index 2f7cee2..0000000 --- a/modules/private/vpn/tinc/host-up +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | |||
3 | SUBDOMAIN=$(echo "$NODE" | sed -e "s/\([A-Z][a-z0-9]*\)/\L\1 /g;" | awk '{ for (i=NF; i>1; i--) printf("%s.",$i); print $1; }') | ||
4 | while [ -z "$NODEIPS" ]; do | ||
5 | NODEIPS=`getent hosts ${SUBDOMAIN}.immae.eu | cut -d' ' -f1 | tr "\\n" ' '` | ||
6 | sleep 5 | ||
7 | done | ||
8 | for NODEIP in $NODEIPS; do | ||
9 | ip neigh add proxy $NODEIP dev @mainInterface@ | ||
10 | done | ||
11 | (cd /var/lib/tinc/@network@/hosts && git pull -q origin master) || true | ||
diff --git a/modules/private/vpn/tinc/tinc-down b/modules/private/vpn/tinc/tinc-down deleted file mode 100755 index 1cc45c0..0000000 --- a/modules/private/vpn/tinc/tinc-down +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # This file closes down the tap device. | ||
3 | |||
4 | echo 0 > /proc/sys/net/ipv6/conf/@mainInterface@/proxy_ndp | ||
5 | echo 0 > /proc/sys/net/ipv6/conf/all/forwarding | ||
6 | |||
7 | GWIP=`getent hosts gw.vpn.immae.eu | head -n1 | cut -d' ' -f1` | ||
8 | |||
9 | ip neigh del proxy $GWIP dev eth0 | ||
10 | |||
11 | ip -6 addr del $GWIP/96 dev $INTERFACE | ||
12 | ip -6 link set $INTERFACE down | ||
diff --git a/modules/private/vpn/tinc/tinc-up b/modules/private/vpn/tinc/tinc-up deleted file mode 100755 index 26c1ec3..0000000 --- a/modules/private/vpn/tinc/tinc-up +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | |||
3 | echo 1 > /proc/sys/net/ipv6/conf/@mainInterface@/proxy_ndp | ||
4 | echo 1 > /proc/sys/net/ipv6/conf/all/forwarding | ||
5 | |||
6 | SUBNET=`getent hosts sn.vpn.immae.eu | head -n1 | cut -d' ' -f1` | ||
7 | GWIP=`getent hosts gw.vpn.immae.eu | head -n1 | cut -d' ' -f1` | ||
8 | |||
9 | ip -6 link set $INTERFACE up mtu 1280 txqueuelen 1000 | ||
10 | |||
11 | ip -6 addr add $GWIP/96 dev $INTERFACE | ||
12 | ip -6 route add $SUBNET/80 dev $INTERFACE | ||
13 | |||
14 | ip neigh add proxy $GWIP dev @mainInterface@ | ||
diff --git a/modules/private/vpn/tinc/tinc.conf b/modules/private/vpn/tinc/tinc.conf deleted file mode 100644 index 7a4f103..0000000 --- a/modules/private/vpn/tinc/tinc.conf +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | BindToAddress = * 655 | ||
2 | BindToAddress = * 1194 | ||
3 | |||
4 | Name = @hostName@ | ||
5 | Interface = vpn6 | ||
6 | |||
7 | Mode = switch | ||
8 | |||
9 | Device = /dev/net/tun | ||
10 | GraphDumpFile = /var/lib/tinc/@network@/tinc_graph | ||
11 | PrivateKeyFile = @keyFile@ | ||