diff options
| author | Patrick Spek <p.spek@tyil.nl> | 2024-04-05 16:12:48 +0200 |
|---|---|---|
| committer | Patrick Spek <p.spek@tyil.nl> | 2024-04-05 16:12:48 +0200 |
| commit | e2002c2780f5062810d64f3c8b0c310b8575a11e (patch) | |
| tree | f799c3c268e2394d3fcf8addc195ccb32960bf67 /playbooks.d | |
| parent | 9d1e48b4f30170f1884e74b77a72efa70623dbf9 (diff) | |
Overhaul vpn-tinc
Diffstat (limited to 'playbooks.d')
| -rw-r--r-- | playbooks.d/vpn-tinc/playbook.bash | 5 | ||||
| -rw-r--r-- | playbooks.d/vpn-tinc/share/host | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/playbooks.d/vpn-tinc/playbook.bash b/playbooks.d/vpn-tinc/playbook.bash index 6a6a957..b23371c 100644 --- a/playbooks.d/vpn-tinc/playbook.bash +++ b/playbooks.d/vpn-tinc/playbook.bash @@ -17,15 +17,17 @@ playbook_add() local name local tinc local tincd + local port data="$(playbook_path "data")" - etc="$(config "fs.etcdir")/tinc/tyilnet" host="$(tr "." "_" <<< "${BASHTARD_PLATFORM[fqdn]}")" ipv4="$(config "$BASHTARD_PLAYBOOK.ipv4")" ipv6="$(config "$BASHTARD_PLAYBOOK.ipv6")" name="$(config "$BASHTARD_PLAYBOOK.name")" tinc="$(config "app.tinc")" tincd="$(config "app.tincd")" + port="$(config "$BASHTARD_PLAYBOOK.port" "655")" + etc="$(config "fs.etcdir")/tinc/$name" case "${BASHTARD_PLATFORM[key]}" in freebsd) iptool=ifconfig ;; @@ -58,6 +60,7 @@ playbook_add() file_template "host" \ "ip4=$ipv4" \ "ip6=$ipv6" \ + "port=$port" \ > "$etc/hosts/$host" chmod +x \ diff --git a/playbooks.d/vpn-tinc/share/host b/playbooks.d/vpn-tinc/share/host index 627aab6..fbcdd4a 100644 --- a/playbooks.d/vpn-tinc/share/host +++ b/playbooks.d/vpn-tinc/share/host @@ -1,3 +1,4 @@ +Port = ${port} + Subnet = ${ip4}/32 Subnet = ${ip6}/128 - |