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:
  Kill christoph IP addresses per request
  Add pejacevic dedication
  Dist nsswitch.conf from puppet
  Add wwids for pejacevic and -srv
  Try to find config harder
  Produce different schroot config files depending on distro
  Make schroot scripts work on wheezy
  Only source /etc/schroot/default/config if it exists

diff --git a/modules/debian-org/files/nsswitch.conf b/modules/debian-org/files/nsswitch.conf
new file mode 100644 (file)
index 0000000..e6a644e
--- /dev/null
+++ b/modules/debian-org/files/nsswitch.conf
@@ -0,0 +1,19 @@
+# /etc/nsswitch.conf
+#
+# Example configuration of GNU Name Service Switch functionality.
+# If you have the `glibc-doc-reference' and `info' packages installed, try:
+# `info libc "Name Service Switch"' for information about this file.
+
+passwd:         compat db
+group:          db compat
+shadow:         compat db
+
+hosts:          files dns
+networks:       files
+
+protocols:      db files
+services:       db files
+ethers:         db files
+rpc:            db files
+
+netgroup:       nis

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index f68ae30b7982817ffe185408c64c2a5c55717ce5..fcef2e89a3c508c29a0c297d2f0e1b114c76dca7 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -208,6 +208,10 @@ class debian-org {
                source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron.ignore',
                require => Package['debian.org']
        }
+       file { '/etc/nsswitch.conf':
+               mode   => '0755',
+               source => 'puppet:///modules/debian-org/nsswitch.conf',
+       }
 
        # set mmap_min_addr to 4096 to mitigate
        # Linux NULL-pointer dereference exploits

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index f962b72bc9737a71a67696a11adeb04a5b922e6c..a50b2e5fb6da19117a2e1064cb9a5fd380fa8b40 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -94,6 +94,7 @@ nameinfo:
   partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
   pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
   pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
+  pejacevic: Dora Pejačević (September 10, 1885 - March 5, 1923)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
   piatti.debian.org: Carlo Alfredo Piatti (January 8th, 1822 - July 18th, 1901)
   picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 226ae70e716fda6fd53829e4720256551cf90f4b..ef88d6b1bcd1a547bda59f9d92db72a789cafc51 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -213,8 +213,8 @@
 @def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6 $master6);
 
 @def $USER_christoph = ();
-@def $USER_christoph = ($USER_christoph 212.114.250.148/31);
-@def $USER_christoph = ($USER_christoph 128.111.48.6/32); # U of Cal at Santa Barbara, until 2013-03
+#@def $USER_christoph = ($USER_christoph 212.114.250.148/31);
+#@def $USER_christoph = ($USER_christoph 128.111.48.6/32); # U of Cal at Santa Barbara, until 2013-03
 @def $USER_aurel32 = ();
 @def $USER_aurel32 = ($USER_aurel32 88.191.126.93); # hall.aurel32.net
 @def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net

diff --git a/modules/multipath/files/bm-multipath.conf b/modules/multipath/files/bm-multipath.conf
index b46d8180c56326113f8503ba4ada28768cf49bdc..9c72d348a647d816c63ed7b89cd90984208d45a3 100644 (file)
--- a/modules/multipath/files/bm-multipath.conf
+++ b/modules/multipath/files/bm-multipath.conf
@@ -56,4 +56,12 @@ multipaths {
                wwid    3600c0ff000d75b581d02705101000000
                alias   adayevskaya
        }
+       multipath {
+               wwid    3600c0ff000d75b58acb28a5101000000
+               alias   pejacevic-srv
+       }
+       multipath {
+               wwid    3600c0ff000d5ad3402a28a5101000000
+               alias   pejacevic
+       }
 }

diff --git a/modules/porterbox/files/schroot-dsa/config b/modules/porterbox/files/schroot-dsa/config
index 4e176c6cc6beffb65a6af482957b8a55a4a63811..86be1a93577bb37355dea3866a50cef2d7e73064 100644 (file)
--- a/modules/porterbox/files/schroot-dsa/config
+++ b/modules/porterbox/files/schroot-dsa/config
@@ -5,7 +5,14 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-. "/etc/schroot/default/config"
+if [ -e "$/etc/schroot/default/config" ]; then
+        . "$/etc/schroot/default/config"
+else
+        FSTAB="/etc/schroot/default/fstab"
+        COPYFILES="/etc/schroot/default/copyfiles"
+        NSSDATABASES="/etc/schroot/default/nssdatabases"
+fi
+
 
 # added by weasel:
 if [ "$CHROOT_SESSION_PURGE" = "true" ]; then

diff --git a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-apt-options b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-apt-options
index 26947b79d4e91098283e6784d5d6792aae2da3b7..1753a7d948c6703020ac48bf5a7da42ade72dd01 100755 (executable)
--- a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-apt-options
+++ b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-apt-options
@@ -12,10 +12,8 @@ set -e
 . "$SETUP_DATA_DIR/common-data"
 . "$SETUP_DATA_DIR/common-functions"
 
-if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+if [ -f "${CHROOT_SCRIPT_CONFIG:-}" ]; then
     . "$CHROOT_SCRIPT_CONFIG"
-elif [ "$STATUS" = "ok" ]; then
-    fatal "script-config file '$CHROOT_SCRIPT_CONFIG' does not exist"
 fi
 
 

diff --git a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
index 854296a8f202d7b98dd24fa59736de7948342fd5..c5a1a20b637156a63b39d90402c117b3ed62c246 100755 (executable)
--- a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
@@ -12,10 +12,12 @@ set -e
 . "$SETUP_DATA_DIR/common-data"
 . "$SETUP_DATA_DIR/common-functions"
 
-if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+if [ -f "${CHROOT_SCRIPT_CONFIG:-}" ]; then
     . "$CHROOT_SCRIPT_CONFIG"
-elif [ "$STATUS" = "ok" ]; then
-    fatal "script-config file '$CHROOT_SCRIPT_CONFIG' does not exist"
+elif [ -f "$CHROOT_PROFILE_DIR/config" ]; then
+    . "$CHROOT_PROFILE_DIR/config"
+else
+    fatal "Cannot find config script"
 fi
 
 

diff --git a/modules/porterbox/files/setup-dchroot b/modules/porterbox/files/setup-dchroot
index 5565ba153ad687104dd611fcb9a90ea7005a296b..e741b2d844272c46ff8d5292c47ec12befe98741 100755 (executable)
--- a/modules/porterbox/files/setup-dchroot
+++ b/modules/porterbox/files/setup-dchroot
@@ -77,9 +77,14 @@ groups=Debian,guest
 root-groups=adm
 source-groups=adm
 source-root-groups=adm
-script-config=dsa/config
 EOF
 
+    if dpkg --compare-versions "$(lsb_release --release --short)" '<' 7; then
+        echo "script-config=dsa/config"
+    else
+        echo "profile=dsa"
+    fi
+
     if [ "$THISARCH" = "$arch" ]; then
         echo "aliases=$suite"
     fi