diff options
| author | lassulus <lassulus@googlemail.com> | 2011-12-27 05:16:43 +0100 |
|---|---|---|
| committer | lassulus <lassulus@googlemail.com> | 2011-12-27 05:16:43 +0100 |
| commit | 1c0aff8f7c7b200424f4f0f93da13dbddacc63f7 (patch) | |
| tree | 1637ed9734ff909b839c7927135dedcc2b64142c /retiolum/scripts | |
| parent | b38d0bd5935e6c07df1b6afb71c8cd54190abe39 (diff) | |
| parent | b3c427c89a49cd8b9391d1dc4d0360dd06554c57 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum/scripts')
| -rwxr-xr-x | retiolum/scripts/routing/defaultroute.sh | 2 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/install.sh | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/retiolum/scripts/routing/defaultroute.sh b/retiolum/scripts/routing/defaultroute.sh index 9d7d6683..b7d703e8 100755 --- a/retiolum/scripts/routing/defaultroute.sh +++ b/retiolum/scripts/routing/defaultroute.sh @@ -40,7 +40,7 @@ do host -4 $host | grep "has address" | awk '{ print $4 }' | while read addr do - route $command $addr gw $defaultroute + route $command $addr gw $defaultroute && echo "$command routing to $addr via $defaultroute" done fi done diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index 1cd7c81d..a6b50b8a 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -39,7 +39,7 @@ then # myipv4=$(echo 42.$(for i in `seq 1 3`; do echo "ibase=16;`bin/fillxx xx|tr [a-f] [A-F]`" | bc; done)|tr \ .)/32 myipv4="${2:-}" - mynet4=42.0.0.0 + mynet4=10.243.0.0 if [ ! "$myipv4" ] then @@ -50,7 +50,7 @@ then printf 'select unused v4 subnet ip (1-255): ' read v4num done - myipv4="42.0.0.$v4num" + myipv4="10.243.0.$v4num" fi echo "Subnet = $myipv4" > hosts/$myname @@ -62,8 +62,7 @@ fi cat>tinc.conf<<EOF Name = $myname -ConnectTo = EUcancER -ConnectTo = kaah +ConnectTo = euer ConnectTo = oxberg ConnectTo = pa_sharepoint ConnectTo = supernode |