From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 9 May 2013 08:25:25 +0000 (+0200)
Subject: Dist nsswitch.conf from puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9d52e9a8f5cfc4a88e368b3874a007f6abb44266;p=mirror%2Fdsa-puppet.git

Dist nsswitch.conf from puppet
---

diff --git a/modules/debian-org/files/nsswitch.conf b/modules/debian-org/files/nsswitch.conf
new file mode 100644
index 000000000..e6a644e61
--- /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 f68ae30b7..fcef2e89a 100644
--- 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