From: martin f. krafft Date: Mon, 16 Sep 2013 13:23:44 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/f1370a797cf7f777c353701a3338e5f96db67cbd Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh Conflicts: .ssh/known_hosts.d/gern.madduck.net --- f1370a797cf7f777c353701a3338e5f96db67cbd diff --cc .ssh/known_hosts.d/gern.madduck.net index 9bda92d,35cade9..a7b0a70 --- a/.ssh/known_hosts.d/gern.madduck.net +++ b/.ssh/known_hosts.d/gern.madduck.net @@@ -1,6 -1,5 +1,6 @@@ wall.gern.madduck.net,wall.gern,wall,192.168.14.1,2001:a60:f0fb::1 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuwGUdpdF+9pbeyhE7MtiqHxqClGO7WH9ojwDJOnEzSM3Z5TiSMHQdksgMHlxikLVSDfY9keWAh3NXvDiRVY8c3i8RVw25PfZ2wPqvPRcn+WA/1mjGg9pKhO+c56Hj1OB6evXlQZSWuCKeGWWyHCPc3TlTp1X3l0Bm3DRQgSsBPdnfGx8YhwqGmkPLhMk6Yhcy1Eun1A20wTWa6ZxnbCg7Rth4ACSkyBx2+mwoZR91jPPb3KPTil2vczwIZHcpbMFrLTHn6tptpc9Aqqreyzbz0cPRTd3+vlMRMkBzTrDNIoliM8gz1J7zcR+3XEsUxyyNbxMa0NK2EkOIH4hNohrFQ== julia.gern.madduck.net,julia.gern,julia,192.168.14.2,2001:a60:f0fb::226:2dff:fe01:11a5 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA513iTel6XMM30yMtr9p49wJ4OZCA1DDZNWI8wS9M7P+0VAZLp9HaDusG/tW1vxIofmKeEcGWSHBtgEPx9zRwdwHy2btMBS60MEY6UVnA4J+sDdhdb7q2+G867ylKSzdSyQkxN/pyQvYdKlTCu+X0q20eU7UPnP+Lq343IyI5yV2NelFZr9OD07IDtsvTDlpx8qdAeYwYkJNZ0OhIduwxBPvQXd693Jp1jh4PODBiFW7zqpUtrdiQKzbGoDMvjtTPhF/0eigsqWTOlW9jPYrazgZFG8rCtR9qhtT5mEWsS9XEH8YMNsVEtmpiY9R7BoCDMgyYPtk0sEXIrrtYvcKyuw== - pict.gern.madduck.net,pict.gern,pict,192.168.14.3,2001:a60:f0fb:0:e611:5bff:fefe:e79d ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC35w9HI+7T/0MrLtUGK6XAeGWwaRJt8wfl3EKPicySmxrc8ENMPMeWmpWoicCkpqkF+F5qKDLvSpDiUXd1bHuKekbM13qS+OIzvJ143IN7RHA6Z4XaxXZQ7X7BThbGNHrVdYAoCVq2pQsicpmj2on5RRmGEuBb3lF2wnTR3Ag0FBz6Zey1H6MIrEcvmwnTdf8yIrJuilFUmfYymKXLGuDbxWhmypM/kM5QcnxtVcfLf0Cxumj8QjTczJEu+DAITeBb1mYeotUp+w5k7XCvRAJ5fMkSAVSlIcvHzpyZeyLPJzk8NEJj4uH0iPYAN3u/wLRUgK3vpxgyVwu5eQAkLngV + pict.gern.madduck.net,pict.gern,pict,192.168.14.3,2001:a60:f0fb::e611:5bff:fefe:e79d ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC35w9HI+7T/0MrLtUGK6XAeGWwaRJt8wfl3EKPicySmxrc8ENMPMeWmpWoicCkpqkF+F5qKDLvSpDiUXd1bHuKekbM13qS+OIzvJ143IN7RHA6Z4XaxXZQ7X7BThbGNHrVdYAoCVq2pQsicpmj2on5RRmGEuBb3lF2wnTR3Ag0FBz6Zey1H6MIrEcvmwnTdf8yIrJuilFUmfYymKXLGuDbxWhmypM/kM5QcnxtVcfLf0Cxumj8QjTczJEu+DAITeBb1mYeotUp+w5k7XCvRAJ5fMkSAVSlIcvHzpyZeyLPJzk8NEJj4uH0iPYAN3u/wLRUgK3vpxgyVwu5eQAkLngV demetrius.gern,demetrius,192.168.14.66,2001:a60:f0fb::211:6bff:fe35:a0b7 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNYNjKwYUJE2dHYRs/18bOXGYbDwv4yirSpWOVDNmcgAIiAs96syaQtZsx1XbV9uJ+R6m6K2T4tw71yxfuhrcj2cKsgIJVXrQfWajRol6M1wFVoksYiX7WnyOXqtp+orT080/MVnIhBWJH2kuFCabtYH6yGAv1Jggm1b3DK3q4V8T41TuInHAOp8VlfUCZKTmwHU4vIeptR6WcMGmZ5p8vyrISXs+y4qjwxlIp2x118ZRqKu6KBpt2Q7xvNINiLoy9Bet1IgF+qA51SZq57xUnLoQRHTUOJXXS0o0GdlknhdunpfQ5f5mPgQ1dk53dmCc3fyXuepcGsIdrCa+3EYA5 - raspberry.gern.madduck.net,raspberry.gern,raspberry,192.168.14.126,2001:a60:f0fb::ba27:ebff:fe5d:5c08 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDN9nB0jngK+iy2zGxoM51qELW/cW7mUkbgrA5dRtL+T2yySV54ADwarK1wwqnY128vAhzQQuUljCs6ho3ga2IyGKAtD8D2e2I/1n5T0v0SwR8h4Py4R/fXBzraogmCjHSQXd6ZBpRivSCTA3u4xds7Slg0RmNVlo+NvuFm1pU36KCYhoW9faB+W4zZQMfSZgwuJVS5p4rR/Qx8AgBV3Y6pXCg93QJYstXiHUvvEnj8JDyNcIHtnrPaoc5pXnJCsKnZsmXOmXPQyd/EhABEo3SfzHZ4V+x2X3Z6FfsOztt/BFEYmASWBjn+TFuaQLVa9hrcZw5U25PN42he2ZinDi1f +fishbowl.gern,192.168.14.33,2001:a60:f0fb::224:d7ff:fe04:c82c ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAo1XZRqJLkvUVOUcI87YU1hNdCO9J5ByMqUuMg6HkmL+uNyfBKeGVKTdfimgWpUsO7U3CLgdINC9pmtjRqTmtH/fT/vFeAM7JtAjrD5RS7AvJW8uRYNZ53t45BgIf2b5l7fYhmd3R8EFpbmZwDijiTDyY640nGFvFTI2mXmADqaSB4t9T3MJxIOQ7WdfspuYk7vNgGQaphupelz4TZLf0wHVpu3fdow3o4CYPJu+D/33s5G4qypxk3+CC+e1ra1Z1E8K+OkZGl3EjvxLoaV8oNDUHD/d3OlF8L4FeztnUNi4jNPFeiCn7bxfz39wLcwQN+hGJuU0/1HvKi2kKNcbQEw== + atom.gern.madduck.net,atom.gern,atom,192.168.14.126,2001:a60:f0fb::ba27:ebff:fe5d:5c08 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDN9nB0jngK+iy2zGxoM51qELW/cW7mUkbgrA5dRtL+T2yySV54ADwarK1wwqnY128vAhzQQuUljCs6ho3ga2IyGKAtD8D2e2I/1n5T0v0SwR8h4Py4R/fXBzraogmCjHSQXd6ZBpRivSCTA3u4xds7Slg0RmNVlo+NvuFm1pU36KCYhoW9faB+W4zZQMfSZgwuJVS5p4rR/Qx8AgBV3Y6pXCg93QJYstXiHUvvEnj8JDyNcIHtnrPaoc5pXnJCsKnZsmXOmXPQyd/EhABEo3SfzHZ4V+x2X3Z6FfsOztt/BFEYmASWBjn+TFuaQLVa9hrcZw5U25PN42he2ZinDi1f