From dfec00ff7b45e2c9c1ff73bc4bd2661c856326e9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 15 Nov 2013 19:05:45 +0100 Subject: tinc-install: fixed os detection --- retiolum/scripts/tinc_setup/new_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') 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' -- cgit v1.2.3 From 8c897886b42f62786b925184b56bafc1a7e06a2f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 17 Nov 2013 21:03:25 +0100 Subject: hosts: added rtjure_debian... --- retiolum/hosts/rtjure_debian_oder_so | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/rtjure_debian_oder_so (limited to 'retiolum') diff --git a/retiolum/hosts/rtjure_debian_oder_so b/retiolum/hosts/rtjure_debian_oder_so new file mode 100644 index 00000000..ecce382b --- /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----- -- cgit v1.2.3 From e24e4ed994c7ebc2ee4ca1279b19ac91bbc21585 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 17 Nov 2013 21:17:03 +0100 Subject: hosts: fixed spaces --- retiolum/hosts/rtjure_debian_oder_so | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'retiolum') diff --git a/retiolum/hosts/rtjure_debian_oder_so b/retiolum/hosts/rtjure_debian_oder_so index ecce382b..3000705b 100644 --- a/retiolum/hosts/rtjure_debian_oder_so +++ b/retiolum/hosts/rtjure_debian_oder_so @@ -1,11 +1,11 @@ -Subnet = 10.243.124.21 -Subnet = 42:9d30:3845:c822:988b:96c5:39ab:90b7 - ------BEGIN RSA PUBLIC KEY----- +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----- +UopJToHcnucM3ofb/NrDs3ygHdQPSRkhhQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 642ea636c6d32904b8eb670f9ebc47cb5f4fad31 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 17 Nov 2013 23:05:16 +0100 Subject: hosts: removed dead rtjure --- retiolum/hosts/rtjure | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 retiolum/hosts/rtjure (limited to 'retiolum') 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----- -- cgit v1.2.3