diff options
| author | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
| commit | dbe2d838ba6834788265029162b2dd7d82473335 (patch) | |
| tree | a4eb38f7fc91d91269b6f83453de62242c6ddc23 /retiolum/hosts/oxberg | |
| parent | 5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
god/temper/Makefile
god/temper/collectd-temper.sh
Diffstat (limited to 'retiolum/hosts/oxberg')
| -rw-r--r-- | retiolum/hosts/oxberg | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/retiolum/hosts/oxberg b/retiolum/hosts/oxberg deleted file mode 100644 index c267b582..00000000 --- a/retiolum/hosts/oxberg +++ /dev/null @@ -1,11 +0,0 @@ -Address = 84.23.80.172 -Subnet = 42:c154:3219:a91c:77eb:91bb:2f18:ff75/128 -Subnet = 42.160.213.134/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA57j66efrYrB7jlBVu6XD6433n/j1QL86KI/l7BCVTE11mJrElElc -YSAOB44arnFurSlU8RZIZAC4gnScmDnjJqCqudxps4wO0JTPqUCvUXkaZQ1fUf7W -H00K05Jkrr6xFHyDwZNrU4uitBfMuAXlUE2A0sFLJiBmFLMSS0abaUg0ALRwFsMI -5ftLHZPMV/TwUollCHQTfwMiMGo28WBm+nYvY+nUZRu3sx8HPLskYWmvt9giu7eo -iQCDee/bHym5Ax9vETpCrkZITq2MJtQdJX46iwvlgKxsV7VkCXAtmU3lMLyTSeRX -582RdmjFP2DdTPEulbL2YyfXVuLs0QIiRQIDAQAB ------END RSA PUBLIC KEY----- |