Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

diff --git a/modules/named/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl
index 8ca867a..801b487 100644 (file)
--- a/modules/named/files/common/named.conf.acl
+++ b/modules/named/files/common/named.conf.acl
@@ -286,4 +286,8 @@ acl AN {
 acl undef {
        country_A1;
        country_A2;
+       8.8.8.8/32; // Google DNS Server fails with GeoIP
+       8.8.4.4/32; // Google DNS Server fails with GeoIP
+       208.67.222.222/32; // OpenDNS fails with GeoIP
+       208.67.220.220/32; // OpenDNS fails with GeoIP
 };

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 1d6cb85..08da26e 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -35,8 +35,7 @@ localkeys
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwe0KhG7S6agOekJ5U2DB/Ze2B5u9/PKo2ha765ZkYOScRWdRWUSOYwBOrrfrQUf1gCicdcsG9lLnbTeFeH4i9UJ8XUf4uhS4rK0RurKf5MN8xlqETU88q7fMTQj5LXkkJXrs8aMCxKmMhGlh62CUbANCY7i6hzXIo7KU1MIdT/E= lucaf@bofh
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1zy2/qSBpYaOKYVEnDI+KEiQlPiKsTv96zJeNdu7xLY1bwd3n0ORyTGO4Hp06PBlfek0f7/xClUHb7xgroTWAebhOes880evhGmYemQyYew+a2nBXyuiEFT8QS+Iw601zFRgy/+0nZvCAkr5Xn+mHtnhQKu5GzWsYVl3uxMo7CEiCOVpupz7FjALAoMgY25JYtFAuK0hwzAO/r9Ja89jmgdAlWJn1uAziwUVBmM6bR6AhhvI+9WR6XDzElz5pVT740kbA6ri+Jv2in9Gp7eIfgdXnaXJvxuqMk0zPB6Y7MZ0UmlvpU4A1h83SAYf6XyOHgWyn+fYhF41OR958ShLIQ== lucaf@portabofh
 # zobel
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvA82iZhdqMbUYXGv9DSMNRmFuXpemOQyAZCd6YkI1XtFEGMN3hlA1XrXRep0FwChCOOs+I/W/vyBdChRKzqxDE1HmTORhCxHNOwWBg1XaRLyeGFo5MEhNzGG0GQBx2+bwVkGLwPTWPQ+A1eV+mm52CpqjeRpeiu4ums6zJ7/oZRwpvZcGoHCu3KxCHtzUwyoufv7BpbwZLk0WyRg70gJ2mwJpVNPFktVSlykdbUmuQ0y76/XIOoCcFD1W44WLu8WWBOWbyPM+gE7pb1Z711MM3k949AJgDqyHYMxTD1d3b2aeoX9zW0zGFrbZVDCrDOkUNlH2b4er/Lm1xXhYQAuSQ== zobel@lunar
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA79oE1QcaEmY/RPA8pJWaY1t9GZ0icXK0dEPpqMwyWeZM3k9Avfx6M/ROGVnDOe+BZ86tZzom1yqOhUdpmSG2akNWfwQXkKrkDEGYfYVLKANaXpgwEJMNrmQGZa9jZtQfcR4ogz6Codk5meegSareWhhIw+oNdaH2KVCwxOYQv8xb1BGIOdOze0LdGiOzXRegtVnquiL3xs1EAiH4RiFbOXwFDnGq3szj54xzO08LrMUqt+xFBNpa6yBeK7VQWpwQU7sml2K1OJ2yux5O9ISmld0/He+OI+Ocse1Fk9UapiWF4RqT4OawpYRJoeS6sSDu2pzsSnMSdvvHwn4VuD0khQ== Martin Zobel-Helas - debian key (2008-08-26)
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuWUv0xRqmnrYX/7b80HIAY9s80Qp4QRFH3DXEkuyDeprJC+GdJs2S/fwhWI9eZDF8NN03SLoOg9q7lXoy2Ts6tda8zfqIf/IBnvcqbsoCtbmrOTvwHj5fVFh0fw72KSc8b+Bccs+1aLXUqP2eSKXB9jpR+apUd7DQ0i6si2/fwrQvqXZ71NeRkcSXIuED9PCA2298DKob1tCAXP1XSIswxxgHdGZgVHYhNt33XSM7zksTbMjr7NBZkJOcgk3dLOVz2RSo38+Curv8nPVoD4uIsE551GXnNTPZiMosvDY3Cy3gTwBhpXFxtkRDr0jMQpYj+ahQ3F+MFJr+0S89QeHfQ== Martin Zobel-Helas - debian adm key (2010-01-04) 
 # weasel
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAqtZYwCwuLP2KZOfqdRyKbexfhcfEiwY7en7aYmY7eUxa396Nzhxv1KOl2xpatD40/TPHtU+GUMxa0PLM7Tn5j2HxZ5S/bjp2l881EWJlYUzZjL95e/PBhPM2r6/VvLTHI7dFI+2s2/LDIuRn3dKsIxFncRzZRjPrpks14wpII4UpVTwQSrBMwkweq0anUiUtw/y7s33fSQJKYu7gXkmkm7mtuF8PJnvI6j482pu34GxWGjjSs9f7ZAm2+mXviVedAsrN3E4MgK14Z6+lOIxfgWmZ2gz33u2nbJ5TCTGJYyxbkaYXXLKo8JW2GtcCZchmhw4kUzo0rfRIXI80e4FEeh3Tj2X0518xp7m/SvKa2nE/dcye2a77ruJZJ0tzHqUmXZSMT5ZdOqgIxeqLGksNFK1mPUbMsfkxbCANVLp17CIeqUtiMYfOjzCuKc3GdYe8Mp47dQx824hnfEldJw9dWH8d+ELO64UsQnEIleQt+d2ASdFK0Vc2SmG7gxcFa2OU9V8TAWx/HKhBhW5KkMKUagATYLgbqzMRfgqslJFDJxB8fQ++Xlodq20MTt2TM9L89ilKyzmG/tNawR71l8+U/sxJS6/sVVXCzHLlMEyVnYRZMBeNwiW2ZBjM+mTv300vUS7+iNUOaZasPOMJqV3d4ImgRUMcOmExMDAnHCRGS10= Peter Palfrader - debian adm key (2008-05-11)
 # sgran