summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <root@pigstarter.de>2013-12-29 17:43:02 +0100
committermakefu <root@pigstarter.de>2013-12-29 17:43:02 +0100
commit02aef1cab3368e46be3359f24f3c2fd293f5b1cb (patch)
tree0178c3d5d46cdb027473858cf903fc0775d27a87
parente7132b290465eeef89c46ab91bb3deda076de215 (diff)
parentbda622d608dc7a713e27b8ac23d6bb69fcc2649d (diff)
Merge branch 'master' of https://github.com/krebscode/painload
-rw-r--r--cholerab/tinc-win7
-rwxr-xr-xretiolum/Makefile2
-rw-r--r--retiolum/hosts/elvis12
-rw-r--r--retiolum/hosts/thomasDOTde9
4 files changed, 29 insertions, 1 deletions
diff --git a/cholerab/tinc-win b/cholerab/tinc-win
new file mode 100644
index 00000000..80076d06
--- /dev/null
+++ b/cholerab/tinc-win
@@ -0,0 +1,7 @@
+install tinc in windows
+add tap device
+Interface instead of device in tinc.conf
+fix ip in windows network device
+generate key
+propagate hosts
+
diff --git a/retiolum/Makefile b/retiolum/Makefile
index 40c5eacc..feb89f73 100755
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -14,7 +14,7 @@ install: upgrade
upgrade: update
if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \
sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; \
- sudo pkill -HUP tincd || :;
+ sudo pkill -HUP tincd || :; \
fi
update: hosts
diff --git a/retiolum/hosts/elvis b/retiolum/hosts/elvis
new file mode 100644
index 00000000..f78243a3
--- /dev/null
+++ b/retiolum/hosts/elvis
@@ -0,0 +1,12 @@
+Address = dn42.wg1337.de
+Subnet = 10.243.228.181
+Subnet = 42:42a3:7ad4:f156:906f:f6f3:943b:7b1d
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAv7wpfzpazvXzKJsDkJ8J9zsTZRoI6LnpSIcO8hLQcHNk6LTWjBy1
+xdnsSe3eQYxNmZPKi28PdbMo4YQlFdewLSB69PP6ZX5ISNXVlCZ5Cend/kfU1fXV
+tcZ4JQCl/adHqg8niLAODfnXhwVjMpllgq6gCg5mVPILy+CZ08OM6Ij7Q5d+3Jr4
+1zMvAXyeuNQcL+MkBveblKC6j/e9fqaK86sUh/4unfgmkB7GWjqFwmoHZepR83o9
+HTBmKxEIDKYjLWVXV1Wph3/JN/65igTtju26cVarUmTtGIhU44NzCi+94+wKuJMU
+Bbjk/CnuWQoU2ABPsxtW3r6m4pSDhypNZQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/thomasDOTde b/retiolum/hosts/thomasDOTde
new file mode 100644
index 00000000..ce47b39e
--- /dev/null
+++ b/retiolum/hosts/thomasDOTde
@@ -0,0 +1,9 @@
+Subnet = 10.243.42.23/32
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA3btaQpK89aRDJ66cW8H9RlDIzr4k4WIGiqNCsIAE5MhSGCtjboWO
+elgRWlYP59l54yRzn5FpvABAWeRupbX/AMhG8IiBgU6438+F2kVlZdJM4DP51F7c
+N2Ek2WKSoIJuiv7Aqb1WlHIWlN3ehg/BXcFPLSav+iChWXAD+MkKmMwL8lGEzsus
+MdbpRLxB0g90FUmpwr2f8euanOXYhU6sjnxH+0JY+j9AwWQLfAqtQ1eGO5MK75Dw
+htPM3Pj90bkfnYNjNXvnyjsQScDjYG/cv/zDwqRQWNcsmT3EqsBnmM5q0EL+Djo1
+lsPTacJdRtHsnQne9daNadnHywQPX+t/QwIDAQAB
+-----END RSA PUBLIC KEY-----