diff options
| author | makefu <github@syntax-fehler.de> | 2013-11-19 08:35:51 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-11-19 08:35:51 +0100 |
| commit | 5788b95fe7834d3049df9de1009f3d8dbc34fea2 (patch) | |
| tree | 76675a9579c7c5e269825bfa73d29fe5256b8afb /retiolum | |
| parent | c15a8d15e910a39a641b21df08e13325a0e29293 (diff) | |
| parent | 6f956cfe65ee00871bc9be19b2acadabb6638a69 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum')
| -rw-r--r-- | retiolum/hosts/rtjure | 10 | ||||
| -rw-r--r-- | retiolum/hosts/rtjure_debian_oder_so | 11 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/retiolum/hosts/rtjure b/retiolum/hosts/rtjure deleted file mode 100644 index f79b42a9..00000000 --- a/retiolum/hosts/rtjure +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:10ce:c102:97e9:f234:fc0d:3e91:1ac0/128 -Subnet = 42.122.79.178/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA1yyfTmYInif82KH/bz6Z2tzSp6loe6wJuBmjTbxIl9AFvGPgYNSI -QCyzZtqcK55+fbA1dQiF1aZLxADM/H42AvrDAKX5C0qi7K4OhciqckutLS6OxwQu -jnfCA6CST8LQ3cy6CIjjQfuBzQWcU79UwgCIJZuJknHYOIJ9j3BBHU8XVJqY2qxB -nE8yIyDstY/hVOLgsLTteWGCTq52C+U19LND1/3T70iWqiJgepsGjVCa/M1v/SLg -acboxH1jRyX+bVbjPCAG2OKQO+hTqJnjVX8LO2qlnxovUDx36igzGCjTGKFA/KVW -+FxMAVZdNRTTzLiB+LUenXb8E8/uqBj3bwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/rtjure_debian_oder_so b/retiolum/hosts/rtjure_debian_oder_so new file mode 100644 index 00000000..3000705b --- /dev/null +++ b/retiolum/hosts/rtjure_debian_oder_so @@ -0,0 +1,11 @@ +Subnet = 10.243.124.21 +Subnet = 42:9d30:3845:c822:988b:96c5:39ab:90b7 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA6J+B/2Wpr9MKu5fuWg9LSoabBKmWmXEWfN7Bs5KMyux9obSBaM8y +dUEx0ayGwUOvDxizuhma9YCbys4P9SDGmocxrhFz2yQeyinEj03EB9ZZiPNQSqbI +Jia39Q/fkxeCescUjr63wR0OY++a+NdefVG5OaSRhNwAmjENZzAxTE/1y5lR7mf4 +U0Pyik/BIARZIc7rnwoYn2TlGgUlu3HX7BxCXIndOFeIjtRzoSG6d+XKhcTXOvvH +WnBNl2D5i48l+V/mDDbLYcXS0al3lgFAOgqXxVXr9WufCBGtNdxlgWlM4zSTUQZw +UopJToHcnucM3ofb/NrDs3ygHdQPSRkhhQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 226e7c1b..1ebde38b 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -336,7 +336,7 @@ find_os() { if grep -qe 'Linux' /etc/*release 2>/dev/null || grep -qe 'Linux' /etc/issue 2>/dev/null; then OS='linux' - elif exists getprop ; then + elif test -e /etc/preferred-apps/google.xml; then OS='android' elif test -e /etc/openwrt_release; then OS='openwrt' |