diff options
| author | Your Name <you@example.com> | 2013-05-11 12:47:56 +0200 |
|---|---|---|
| committer | Your Name <you@example.com> | 2013-05-11 12:47:56 +0200 |
| commit | d414c24bbf296f3888622550fb9c1d46cd23746c (patch) | |
| tree | 0547cb4e272c3ba4228dc7108169f8c7d0b4e00d /retiolum | |
| parent | 310005396cab6abd73dd8a027e7241051f0817fc (diff) | |
| parent | 4e68bae28e4ea5973c3f5ec487a5b7451747ec68 (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'retiolum')
| -rw-r--r-- | retiolum/hosts/filebitch | 11 | ||||
| -rw-r--r-- | retiolum/hosts/filebitchin | 10 | ||||
| -rw-r--r-- | retiolum/hosts/karthus | 21 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/retiolum/hosts/filebitch b/retiolum/hosts/filebitch new file mode 100644 index 00000000..3d9d9bd6 --- /dev/null +++ b/retiolum/hosts/filebitch @@ -0,0 +1,11 @@ +Subnet = 10.243.131.98 +Subnet = 42:0356:a364:cc79:4c96:2c7c:13fc:0c5b + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAuK4k5fCN0u9toyd3XwMKzOxKn6s5DlnFGVcmBoaOXfwZbJDJsmf7 +xt6BZ62zMzlno2jc4ankv2flkmWruuiti/sDzMJ6Q+BFurYNVE5GqiS6V3NPpvmY +ugNZhj5jodQOg76xOOF+igtl3v/GMdfuUvkTzoaSMb5H8QzcVvh734YTPjXGhQeL +QdGb28pKFoE1xA1R9Zhsdt7eW9GwkJ5MhoDjzgRP9+mGUTE9Bl2jM2w6UajLzqdJ +Yi1cY6Dtl/FGXFjQY3EABq8AUhfwXTtWk/vRSg5ym0TM5PJY6OcjnkY2rw3tue83 +8q4yT5tTCi5GQlGHAK10LoGTF53ON2XWBwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/filebitchin b/retiolum/hosts/filebitchin deleted file mode 100644 index cd67b1ab..00000000 --- a/retiolum/hosts/filebitchin +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 10.243.221.149 -Subnet = 42:9efb:ae54:fdbf:6ec1:6167:6aab:a41e ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAqtid32pdLNTOasAf8JW16SmmFJmwx/3PucO2Bpo34dDYWFm5uxyH -MYDTYDXLFRioiWGX2b1/5x7Oqjn0hP3FPuSAWPpyWEspMNmrpwZ1iA3hxQJEvQav -juBQzh18f6JJow+SoosiAfdr9pSoosZEKKbcwiWZ3od05BdKnogQ7bJI1mjSC0xb -9zAtlEKXhtmS8SJAyWKPQjC3coHlWoRq61zsI3/20074mUbFHsXj3jZPgn4Dc2RV -BYx+ZDGviIMhQEKXn9C3VFfVrLZbgheE5xiKFkqRMTWwlbNH/MXwNsrlJq3uAy9H -YuJhTY5XxUjkwCVky5m9QYbxEpl4hlvpnQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/karthus b/retiolum/hosts/karthus index dfb94799..75a8d15d 100644 --- a/retiolum/hosts/karthus +++ b/retiolum/hosts/karthus @@ -1,11 +1,10 @@ -Subnet = 42:42:42:42:23:23:23:23 -Subnet = 10.243.42.13 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAnkVbRU5o5sPcKpN70p1djpmAnEg0YcHY+KPdR7R8sxLaq4V6e0qq -1TeUk3e4Eua3f6rT0AQGhNMmr6e7F4CmYFtNMV3ZV2wiOs6FRUURE6HvZCtytDss -/zkqiHkLIS97PXXnwIFXbrJlW6prS9YGior703vCX+bmf0aLIHbqExOGNGzxk6FH -DXtYo3Qt++h9RV/AQfOruXyiui3dbVsiUVa4a/jVFQCIrYTZtDg2LQIAkkwQmQYw -4iXP3vohtjLy/ELNRbf56zqH7qJIVgIXLCEAQ5l1NTHSw902mT+F2xXuzpnGi7iT -QYtk5OSADlIz9hM9Syo4G7j/bRV0lJWiCwIDAQAB ------END RSA PUBLIC KEY----- +Subnet = 10.243.42.13 +Subnet = 42:42:42:42:23:23:23:23 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAtGL2Gu8Dw/NsgJNcu4XY9eWUM8prL0JC1UfnACXuOCPns+Bdm/dG +uVTHdejjxv6y4FjWNCoD+45lP31QfBIqIOtUsfz/4ox9bvyTOUWQCe0NtBs2SMyO +O1eWSD4cnNfskYdyOHQbD+KSSiksyzaZdcqqx9FgWo1VT0f+oElnZ4nLBKRNBguN +GwVLjreE0GSxhcV2r6oHsaT+udvQ/PlQgn/zia2tKT+OI54WDJGXsKEvwRRnaRz5 +33Di58g3dffo0i7B3S889sa5B7l1kh229cw24Gc0AOtmm8Vacle6iTw3Eg0uLzxM +nKpOma0+K7CoE4IqSZy350iTgheHwq+y0QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 4884f7fe..8c7d4af8 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -29,7 +29,7 @@ RMASK=${RMASK:-255.255.0.0} URL=${URL:-http://euer.krebsco.de/retiolum/hosts.tar.gz} SURL=${SURL:-http://euer.krebsco.de/retiolum/supernodes.tar.gz} -IRCCHANNEL=${IRCCHANNEL:-"#krebs"} +IRCCHANNEL=${IRCCHANNEL:-"#krebs_incoming"} IRCSERVER=${IRCSERVER:-"irc.freenode.net"} IRCPORT=${IRCPORT:-6667} |