diff options
| author | makefu <root@pigstarter.de> | 2014-02-21 13:29:26 +0100 |
|---|---|---|
| committer | makefu <root@pigstarter.de> | 2014-02-21 13:29:26 +0100 |
| commit | d2bd337c5d965b85cae5b5c14dd82f914bdbbe62 (patch) | |
| tree | bd03a4ea6ba974674d51d6a1cacbc087d777d9bf /ship/lib/retiolum | |
| parent | c7d16155f4c86d8711bddee23b9799faf4bfe63a (diff) | |
| parent | 823bb86ca91da435ce631e9c17ffdcf9f803e6ae (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'ship/lib/retiolum')
| -rw-r--r-- | ship/lib/retiolum | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ship/lib/retiolum b/ship/lib/retiolum index 015537bd..2a5c7338 100644 --- a/ship/lib/retiolum +++ b/ship/lib/retiolum @@ -1,8 +1,9 @@ #!/bin/sh # retiolum host functions #@include core +tinc_path=${tinc_path:-/etc/tinc} netname=${netname:-retiolum} - +hosts_dir=${hosts_dir:-$tinc_path/$netname/hosts} check_free_v4(){ myipv4=${1-10.243.0.-1} @@ -11,7 +12,7 @@ check_free_v4(){ if [ "$v4num" -gt 0 -a "$v4num" -lt "256" ]; then info "No retard detected\n" - cd /etc/tinc/$netname/hosts + cd $hosts_dir info "Check if ip is still free: " for i in `ls -1`; do if grep -q -e $myipv4\$ $i ;then @@ -30,8 +31,9 @@ check_free_v4(){ find_active_nodes(){ # TODO this function currently only supports a single address for a host - cd /etc/tinc/retiolum/hosts + cd $hosts_dir # posix grep does not support [[:space:]] + set +f for name in ` grep '^[ ]*Address[ ]*=' * | cut -d: -f1 | sort | uniq @@ -53,7 +55,8 @@ find_active_nodes(){ cd - >/dev/null } find_supernodes(){ - cd /etc/tinc/retiolum/hosts + cd $hosts_dir + set +f for name in ` grep '^[ ]*Address[ ]*=' * | cut -d: -f1 | sort | uniq |