diff options
| author | makefu <github@syntax-fehler.de> | 2013-12-11 00:53:45 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-12-11 00:53:45 +0100 |
| commit | 22205a0c0ecde1885860346707773aaffe01e9b3 (patch) | |
| tree | 19df982557234c53da00eba9c6c1e73615d14d22 | |
| parent | 62be5c21f9fa17f7452acf8064800911faae051d (diff) | |
| parent | e847dd73730eb638d75e2d0cbc36340be7bb517e (diff) | |
Merge branch 'master' of github.com:krebscode/painload
| -rw-r--r-- | cholerab/Gewaltenteilung/deps.txt | 4 | ||||
| -rw-r--r-- | retiolum/hosts/irkel | 12 | ||||
| -rw-r--r-- | retiolum/hosts/pigstarter | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/cholerab/Gewaltenteilung/deps.txt b/cholerab/Gewaltenteilung/deps.txt deleted file mode 100644 index 8eadcdd8..00000000 --- a/cholerab/Gewaltenteilung/deps.txt +++ /dev/null @@ -1,4 +0,0 @@ -core retiolum Reaktor -retiolum -Reaktor retiolum -noise core diff --git a/retiolum/hosts/irkel b/retiolum/hosts/irkel new file mode 100644 index 00000000..b197e5d2 --- /dev/null +++ b/retiolum/hosts/irkel @@ -0,0 +1,12 @@ +Subnet = 10.243.253.117 +Subnet = 42:1970:cb1b:d9e2:4603:c1fe:ee00:8145 +Address = 2a01:4f8:140:21cb::5 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1i2XcUold9p5aa4qGv2o3hMwlIt4+CBxuOwnzMOp4WjJyGWBrQiM +Lw9qpwvc0W6c/MYTAUzkq42766jlYRzA/yse0/DeKJvF5BrCk36eH9R2okK1A7K5 +tk725pTf6D37mkjbiupo7FFfHNGjFdSH7174ZpK/N81YWgrGo1cQUU8JJKGgFv6S +XZWiWbJWKnLW/a4zyg7wnkH3KlvOAthSNgyrVqZazi6gTJ12kZTg9DGg+Q7iTdi5 +oXc4hilymCdF2fDfmG7M3naaRQKntjlpJmc2Au7wTVXj3525c3Ms+1k//HlX8DQK +a93ZJA25nfpoYznx73lz/IASO2n/jn/3mwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/pigstarter b/retiolum/hosts/pigstarter index b1c08801..dd12a0d8 100644 --- a/retiolum/hosts/pigstarter +++ b/retiolum/hosts/pigstarter @@ -1,4 +1,5 @@ Address = 192.40.56.122 +Address = 2604:2880::841f:72c #Address = pigstarter.de Subnet = 10.243.0.153 Subnet = 42:9143:b4c0:f981:6030:7aa2:8bc5:4110/128 |