summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <root@pigstarter.de>2014-05-05 09:53:50 +0200
committermakefu <root@pigstarter.de>2014-05-05 09:53:50 +0200
commit9a94b8c617aa05f351e8010a090bf8f7eb3a55d1 (patch)
treede658bc0b1541a0e1ac624cd9a5dc581a9b0be65
parent92fe3350fe6e3da26fa1ad0522aabaa0f146d575 (diff)
parent7164850da540710107411f8a94a853b51d38e861 (diff)
Merge branch 'master' of https://github.com/krebscode/painload
-rw-r--r--retiolum/hosts/foobar11
-rw-r--r--retiolum/hosts/kaepsele11
-rwxr-xr-xretiolum/scripts/tinc_setup/new_install.sh2
3 files changed, 23 insertions, 1 deletions
diff --git a/retiolum/hosts/foobar b/retiolum/hosts/foobar
new file mode 100644
index 00000000..2c77b79c
--- /dev/null
+++ b/retiolum/hosts/foobar
@@ -0,0 +1,11 @@
+Subnet = 10.243.135.219
+Subnet = 42:edd1:d518:f7d8:ada3:1ce3:f4f5:a986
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAsCu6xC0OctUKu0UsscOWfyQlMtMrD0Pt/wB+IDOnkEgDKqcTYGXW
+h6VqMqE2cQhV3ThoxqeIPnQzwiMuVd0n2q3ZDexfYvHmqTZoaMrQZJlgY4rDx8jC
+USFqnvtkJbOxFBiS3c5yjOIybGSGDXrAaxmn80xewNIsdSqaY1/2FxKwx1Fn+Kf2
+hIQOEYkdLhwPso+HyNGUwVKjsRVCSWdJSzBHB38cPZRoPpcmRHOTs/Jtx0b4RXQr
+tVYW8i+Jq6hCt9sDLJexP9unPGl30Gn052noj1t4DRCPFpOYSLJFcGU4n/OzYbzY
+O8VB5DjgGK0eyEXvtByxvWYPnuRwSLaH3wIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/kaepsele b/retiolum/hosts/kaepsele
new file mode 100644
index 00000000..fc8bf458
--- /dev/null
+++ b/retiolum/hosts/kaepsele
@@ -0,0 +1,11 @@
+Subnet = 10.243.166.2
+Subnet = 42:0b9d:6660:d07c:2bb7:4e91:1a01:2e7d
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAxj7kaye4pGLou7mVRTVgtcWFjuEosJlxVg24gM7nU1EaoRnBD93/
+Y3Je7BSUbz5xMXr5SFTPSkitInL7vU+jDOf2bEpqv+uUJAJIz85494oPS9xocdWo
+rQsrQRAtOg4MLD+YIoAxQm2Mc4nt2CSE1+UP4uXGxpuh0c051b+9Kmwv1bTyHB9y
+y01VSkDvNyHk5eA+RGDiujBAzhi35hzTlQgCJ3REOBiq4YmE1d3qpk3oNiYUcrcu
+yFzQrSRIfhXjuzIR+wxqS95HDUsewSwt9HgkjJzYF5sQZSea0/XsroFqZyTJ8iB5
+FQx2emBqB525cWKOt0f5jgyjklhozhJyiwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 1f45a3cc..25e7f04d 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -43,7 +43,7 @@ main(){
RAND4=1
RAND6=1
- if $(echo $HOSN | grep -q -); then
+ if $(echo $HOSTN | grep -q -); then
echo 'invalid hostname, - not allowed'
exit 1
fi