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 --git a/modules/apache2/files/per-host/wieck.debian.org/etc/logrotate.d/apache2 b/modules/apache2/files/per-host/wieck.debian.org/etc/logrotate.d/apache2
new file mode 100644 (file)
index 0000000..9dd2f05
--- /dev/null
+++ b/modules/apache2/files/per-host/wieck.debian.org/etc/logrotate.d/apache2
@@ -0,0 +1,21 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+/var/log/apache2/*.log {
+       daily
+       dateext
+       missingok
+       rotate 15
+       compress
+       delaycompress
+       notifempty
+       create 644 root adm
+       sharedscripts
+       postrotate
+               if [ -f "`. /etc/apache2/envvars ; echo ${APACHE_PID_FILE:-/var/run/apache2.pid}`" ]; then
+                       /etc/init.d/apache2 reload > /dev/null
+               fi
+       endscript
+}

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index 2cc25b4..0e5406c 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -69,7 +69,7 @@ darmstadt:
     - 82.195.75.32/28
     - 2001:41b8:202:deb::/64
   searchpaths: [debprivate-darmstadt.debian.org]
-  nameservers: [82.195.75.81, 82.195.66.249, 217.198.242.225]
+  nameservers: [82.195.66.249, 217.198.242.225]
 dgi:
   netrange:
     - 93.94.130.128/26

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 52c2773..1c557c5 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -338,6 +338,7 @@ host_settings:
     - unger.debian.org
     - villa.debian.org
     - vitry.debian.org
+    - vivaldi.debian.org
     - widor.debian.org
     - wieck.debian.org
     - zandonai.debian.org

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index b05b76a..a992e9b 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -85,6 +85,7 @@ nagios                beethoven=(debbackup)   NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %debvoip       cilea=(freeswitch)      ALL
 %debwww                ALL=(debwww)    ALL
 %btslink       ALL=(btslink)   ALL
+%emdebian      ALL=(emdebian)  ALL
 %forums                ALL=(forums)    ALL
 %keyring       ALL=(keyring)   ALL
 %lintian       ALL=(lintian)   ALL