diff options
| author | makefu <root@pigstarter.de> | 2013-05-14 12:11:11 +0200 |
|---|---|---|
| committer | makefu <root@pigstarter.de> | 2013-05-14 12:11:11 +0200 |
| commit | 13218101e633fcfd163e5e677d02851615fc47c9 (patch) | |
| tree | 63ddf88c4d4022c6ab8f4b095140e9f05ab7c34d /retiolum | |
| parent | 8ecd8b9e2714e559fc05983be69be409196d5da7 (diff) | |
| parent | d414c24bbf296f3888622550fb9c1d46cd23746c (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'retiolum')
| -rwxr-xr-x | retiolum/bin/update-retiolum-hosts | 2 | ||||
| -rw-r--r-- | retiolum/hosts/karthus | 21 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 2 |
3 files changed, 12 insertions, 13 deletions
diff --git a/retiolum/bin/update-retiolum-hosts b/retiolum/bin/update-retiolum-hosts index 214ac205..eb57af3f 100755 --- a/retiolum/bin/update-retiolum-hosts +++ b/retiolum/bin/update-retiolum-hosts @@ -11,4 +11,4 @@ fi cd $(dirname $(readlink -f $0))/.. mkdir -p /etc/tinc/retiolum/hosts -rsync -va --delete hosts/ /etc/tinc/retiolum/hosts/ +rsync -va -I --delete hosts/ /etc/tinc/retiolum/hosts/ 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} |