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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  sudo for emdebian
  vivaldi → squeeze
  Try something with logrotate on wieck
  82.195.75.81 no longer works as nameserver

Conflicts:
	modules/debian-org/misc/local.yaml

diff --cc modules/debian-org/misc/local.yaml
index 52c27739708cd5fd2d26e9fe1220b535126431ea,5b72b196f650ded7f19b9e25867f8a3d8c1ece89..1c557c5b541dcd4658a011375f66942caacaf3bd
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -338,6 -340,8 +338,7 @@@ host_settings
      - unger.debian.org
      - villa.debian.org
      - vitry.debian.org
 -    - voltaire.debian.org
+     - vivaldi.debian.org
      - widor.debian.org
      - wieck.debian.org
      - zandonai.debian.org