diff options
| author | euer <root@euer.krebsco.de> | 2012-12-07 15:56:41 +0100 |
|---|---|---|
| committer | euer <root@euer.krebsco.de> | 2012-12-07 15:56:41 +0100 |
| commit | 4b04e2c71f42c78a6a69dca085c4a2912f3d39d3 (patch) | |
| tree | e007078dde45a19a792d9cf86f4727af509b0e4d /retiolum | |
| parent | 8b31b7db47438b72504915efa062702ff99860f6 (diff) | |
| parent | dfe735f225f409eb01def7691a42a69c882366b8 (diff) | |
Met push origin master
rge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum')
| -rwxr-xr-x | retiolum/bin/dump-graph | 9 | ||||
| -rw-r--r-- | retiolum/doc/cronjob | 3 | ||||
| -rw-r--r-- | retiolum/hosts/TodesBrot | 9 | ||||
| -rw-r--r-- | retiolum/hosts/juhulian | 22 | ||||
| -rw-r--r-- | retiolum/hosts/laqueus | 4 |
5 files changed, 25 insertions, 22 deletions
diff --git a/retiolum/bin/dump-graph b/retiolum/bin/dump-graph new file mode 100755 index 00000000..87539f49 --- /dev/null +++ b/retiolum/bin/dump-graph @@ -0,0 +1,9 @@ +#! /bin/sh +set -euf + +t0="`date '+%Y-%m-%d %H:%M:%S'`" +systemctl kill --signal=USR2 tincd@retiolum +sleep 5 +journalctl --since="$t0" | sed -n ' + s/.*tinc\.retiolum\[[0-9]\+\]: \([^ ]\+\) to \([^ ]\+\) at \([^ ]\+\) .*$/\1 \2 \3/p +' diff --git a/retiolum/doc/cronjob b/retiolum/doc/cronjob new file mode 100644 index 00000000..356b5c96 --- /dev/null +++ b/retiolum/doc/cronjob @@ -0,0 +1,3 @@ +cron-eintrag fuer automatisches hosts-update + +if ping -c 1 euer.krebsco.de -W 5 &>/dev/null; then (curl http://euer.krebsco.de/retiolum/hosts.tar.gz | tar xzk -C /etc/tinc/retiolum/hosts/);fi diff --git a/retiolum/hosts/TodesBrot b/retiolum/hosts/TodesBrot deleted file mode 100644 index f76b72b2..00000000 --- a/retiolum/hosts/TodesBrot +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.243.0.12/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAzGIijXaoIRG09v5sIXyVdqdpDruPMqKJfvZUXCF/POMCZEsZ4tjd -jHHdbTfREExvSNBUxS6GaYwg/HR2R7nprzOazSN9kzp9fmFJofbCOxz6X/8O/fMM -gTBmZzYu4cfysjTD5tsrJp/dQOZ0wKpUXBOWWWDUTLM9Zo3+6Bxe/6pN+gphvl6m -ReIAwl34QkZ24mq1W4YZofU2PxLxnhtuBgXuJRfn8FDlgKKPhPpKX070J5pamzpp -1/Idxl0zTmoKeXWhJ0wY0SNeglaWgH1P2EeNUNoVEX4Egk4XQGkzOfShRG7zoJMA -tKJlNZOw/4EF3E/IM8mG1yG3NqtFlIyNYQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/juhulian b/retiolum/hosts/juhulian index eca4e873..d9da75aa 100644 --- a/retiolum/hosts/juhulian +++ b/retiolum/hosts/juhulian @@ -1,11 +1,11 @@ -Subnet = 10.243.0.38
-Subnet = 42:449f:b00a:e973:514c:3e9f:97ed:aac2/128
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAnNyOsNItOzNQndheZ3ppOMWvIOuO1wgLXArINS1ORcgIAJmLpqDI
-whsZFCVifwAXsdeBJyyZOPZrc2PQ4F3KB9ByX6PQ9jqAhun1aE9SDDqp+woOrTlP
-BtJ/8zAmRhrfak61TxpeTndLk95xOLaCwvS2P4SJLIcyutTbbFdBCqpu7cFUGOOP
-qCKLX7/mv2L+GNmQAnWZ5HwXQzBS6gNaNIcQ8mPCUAIZgRU2T83x/tnyH1RlATK2
-lYUWRM0ie+dRMhiDcwmmZrwYl8wzyvuBPEr/p8ZBM2tua8GlQzJUJl44AiAcx3w9
-0EB5MIRL5Qb0yBvXD0yR+bDizqvhd40LvQIDAQAB
------END RSA PUBLIC KEY-----
+Subnet = 10.243.0.38 +Subnet = 42:449f:b00a:e973:514c:3e9f:97ed:aac2/128 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAnNyOsNItOzNQndheZ3ppOMWvIOuO1wgLXArINS1ORcgIAJmLpqDI +whsZFCVifwAXsdeBJyyZOPZrc2PQ4F3KB9ByX6PQ9jqAhun1aE9SDDqp+woOrTlP +BtJ/8zAmRhrfak61TxpeTndLk95xOLaCwvS2P4SJLIcyutTbbFdBCqpu7cFUGOOP +qCKLX7/mv2L+GNmQAnWZ5HwXQzBS6gNaNIcQ8mPCUAIZgRU2T83x/tnyH1RlATK2 +lYUWRM0ie+dRMhiDcwmmZrwYl8wzyvuBPEr/p8ZBM2tua8GlQzJUJl44AiAcx3w9 +0EB5MIRL5Qb0yBvXD0yR+bDizqvhd40LvQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/laqueus b/retiolum/hosts/laqueus index cf4ecad5..0bdef307 100644 --- a/retiolum/hosts/laqueus +++ b/retiolum/hosts/laqueus @@ -1,5 +1,5 @@ -Subnet = 42:0:0:0:0:0:0:1a1a/128
-Subnet = 10.243.0.12/32
+Subnet = 42:0:0:0:0:0:0:1a1a/128 +Subnet = 10.243.0.12/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAy9lnH4qDSYeNbpzpcQyq2LzzxkVy2N1vGgKkVttzx0cgMvyRm3aX |