From 1bc4a11bb1d97253c49077ef51fba576988d5f96 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 2 Jul 2013 15:32:38 +0200
Subject: [nscd] extra module for nscd, removed from pam module

---
 remote/modules/nscd/data/etc/nscd.conf            | 90 +++++++++++++++++++++++
 remote/modules/nscd/data/etc/tmpfiles.d/nscd.conf |  1 +
 remote/modules/nscd/nscd.build                    | 17 +++++
 remote/modules/nscd/nscd.conf                     |  9 +++
 remote/modules/pam/data/etc/nscd.conf             | 90 -----------------------
 remote/modules/pam/data/etc/tmpfiles.d/nscd.conf  |  1 -
 remote/modules/pam/pam.conf                       |  3 -
 7 files changed, 117 insertions(+), 94 deletions(-)
 create mode 100644 remote/modules/nscd/data/etc/nscd.conf
 create mode 100644 remote/modules/nscd/data/etc/tmpfiles.d/nscd.conf
 create mode 100644 remote/modules/nscd/nscd.build
 create mode 100644 remote/modules/nscd/nscd.conf
 delete mode 100644 remote/modules/pam/data/etc/nscd.conf
 delete mode 100644 remote/modules/pam/data/etc/tmpfiles.d/nscd.conf

(limited to 'remote/modules')

diff --git a/remote/modules/nscd/data/etc/nscd.conf b/remote/modules/nscd/data/etc/nscd.conf
new file mode 100644
index 00000000..d0a3b107
--- /dev/null
+++ b/remote/modules/nscd/data/etc/nscd.conf
@@ -0,0 +1,90 @@
+#
+# /etc/nscd.conf
+#
+# An example Name Service Cache config file.  This file is needed by nscd.
+#
+# Legal entries are:
+#
+#	logfile			<file>
+#	debug-level		<level>
+#	threads			<initial #threads to use>
+#	max-threads		<maximum #threads to use>
+#	server-user             <user to run server as instead of root>
+#		server-user is ignored if nscd is started with -S parameters
+#       stat-user               <user who is allowed to request statistics>
+#	reload-count		unlimited|<number>
+#	paranoia		<yes|no>
+#	restart-interval	<time in seconds>
+#
+#       enable-cache		<service> <yes|no>
+#	positive-time-to-live	<service> <time in seconds>
+#	negative-time-to-live   <service> <time in seconds>
+#       suggested-size		<service> <prime number>
+#	check-files		<service> <yes|no>
+#	persistent		<service> <yes|no>
+#	shared			<service> <yes|no>
+#	max-db-size		<service> <number bytes>
+#	auto-propagate		<service> <yes|no>
+#
+# Currently supported cache names (services): passwd, group, hosts, services
+#
+
+
+#	logfile			/var/log/nscd.log
+#	threads			4
+#	max-threads		32
+#	server-user		nobody
+#	stat-user		somebody
+	debug-level		0
+#	reload-count		5
+	paranoia		no
+#	restart-interval	3600
+
+	enable-cache		passwd		yes
+	positive-time-to-live	passwd		600
+	negative-time-to-live	passwd		20
+	suggested-size		passwd		211
+	check-files		passwd		yes
+	persistent		passwd		yes
+	shared			passwd		yes
+	max-db-size		passwd		33554432
+	auto-propagate		passwd		yes
+
+	enable-cache		group		yes
+	positive-time-to-live	group		3600
+	negative-time-to-live	group		60
+	suggested-size		group		211
+	check-files		group		yes
+	persistent		group		yes
+	shared			group		yes
+	max-db-size		group		33554432
+	auto-propagate		group		yes
+
+	enable-cache		hosts		yes
+	positive-time-to-live	hosts		3600
+	negative-time-to-live	hosts		20
+	suggested-size		hosts		211
+	check-files		hosts		yes
+	persistent		hosts		yes
+	shared			hosts		yes
+	max-db-size		hosts		33554432
+
+	enable-cache		services	yes
+	positive-time-to-live	services	28800
+	negative-time-to-live	services	20
+	suggested-size		services	211
+	check-files		services	yes
+	persistent		services	yes
+	shared			services	yes
+	max-db-size		services	33554432
+
+# netgroup caching is known-broken, so disable it in the default config,
+# see: https://bugs.launchpad.net/ubuntu/+source/eglibc/+bug/1068889
+	enable-cache		netgroup	no
+	positive-time-to-live	netgroup	28800
+	negative-time-to-live	netgroup	20
+	suggested-size		netgroup	211
+	check-files		netgroup	yes
+	persistent		netgroup	yes
+	shared			netgroup	yes
+	max-db-size		netgroup	33554432
diff --git a/remote/modules/nscd/data/etc/tmpfiles.d/nscd.conf b/remote/modules/nscd/data/etc/tmpfiles.d/nscd.conf
new file mode 100644
index 00000000..57c16660
--- /dev/null
+++ b/remote/modules/nscd/data/etc/tmpfiles.d/nscd.conf
@@ -0,0 +1 @@
+D /var/run/nscd 0755 root root
diff --git a/remote/modules/nscd/nscd.build b/remote/modules/nscd/nscd.build
new file mode 100644
index 00000000..bd189b66
--- /dev/null
+++ b/remote/modules/nscd/nscd.build
@@ -0,0 +1,17 @@
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+
+	return 0
+}
+
+post_copy() {
+	:
+}
diff --git a/remote/modules/nscd/nscd.conf b/remote/modules/nscd/nscd.conf
new file mode 100644
index 00000000..3f25aea9
--- /dev/null
+++ b/remote/modules/nscd/nscd.conf
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	nscd
+"
+REQUIRED_CONTENT_PACKAGES="
+	nscd
+"
+REQUIRED_BINARIES="
+	nscd
+"
diff --git a/remote/modules/pam/data/etc/nscd.conf b/remote/modules/pam/data/etc/nscd.conf
deleted file mode 100644
index d0a3b107..00000000
--- a/remote/modules/pam/data/etc/nscd.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# /etc/nscd.conf
-#
-# An example Name Service Cache config file.  This file is needed by nscd.
-#
-# Legal entries are:
-#
-#	logfile			<file>
-#	debug-level		<level>
-#	threads			<initial #threads to use>
-#	max-threads		<maximum #threads to use>
-#	server-user             <user to run server as instead of root>
-#		server-user is ignored if nscd is started with -S parameters
-#       stat-user               <user who is allowed to request statistics>
-#	reload-count		unlimited|<number>
-#	paranoia		<yes|no>
-#	restart-interval	<time in seconds>
-#
-#       enable-cache		<service> <yes|no>
-#	positive-time-to-live	<service> <time in seconds>
-#	negative-time-to-live   <service> <time in seconds>
-#       suggested-size		<service> <prime number>
-#	check-files		<service> <yes|no>
-#	persistent		<service> <yes|no>
-#	shared			<service> <yes|no>
-#	max-db-size		<service> <number bytes>
-#	auto-propagate		<service> <yes|no>
-#
-# Currently supported cache names (services): passwd, group, hosts, services
-#
-
-
-#	logfile			/var/log/nscd.log
-#	threads			4
-#	max-threads		32
-#	server-user		nobody
-#	stat-user		somebody
-	debug-level		0
-#	reload-count		5
-	paranoia		no
-#	restart-interval	3600
-
-	enable-cache		passwd		yes
-	positive-time-to-live	passwd		600
-	negative-time-to-live	passwd		20
-	suggested-size		passwd		211
-	check-files		passwd		yes
-	persistent		passwd		yes
-	shared			passwd		yes
-	max-db-size		passwd		33554432
-	auto-propagate		passwd		yes
-
-	enable-cache		group		yes
-	positive-time-to-live	group		3600
-	negative-time-to-live	group		60
-	suggested-size		group		211
-	check-files		group		yes
-	persistent		group		yes
-	shared			group		yes
-	max-db-size		group		33554432
-	auto-propagate		group		yes
-
-	enable-cache		hosts		yes
-	positive-time-to-live	hosts		3600
-	negative-time-to-live	hosts		20
-	suggested-size		hosts		211
-	check-files		hosts		yes
-	persistent		hosts		yes
-	shared			hosts		yes
-	max-db-size		hosts		33554432
-
-	enable-cache		services	yes
-	positive-time-to-live	services	28800
-	negative-time-to-live	services	20
-	suggested-size		services	211
-	check-files		services	yes
-	persistent		services	yes
-	shared			services	yes
-	max-db-size		services	33554432
-
-# netgroup caching is known-broken, so disable it in the default config,
-# see: https://bugs.launchpad.net/ubuntu/+source/eglibc/+bug/1068889
-	enable-cache		netgroup	no
-	positive-time-to-live	netgroup	28800
-	negative-time-to-live	netgroup	20
-	suggested-size		netgroup	211
-	check-files		netgroup	yes
-	persistent		netgroup	yes
-	shared			netgroup	yes
-	max-db-size		netgroup	33554432
diff --git a/remote/modules/pam/data/etc/tmpfiles.d/nscd.conf b/remote/modules/pam/data/etc/tmpfiles.d/nscd.conf
deleted file mode 100644
index 57c16660..00000000
--- a/remote/modules/pam/data/etc/tmpfiles.d/nscd.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/nscd 0755 root root
diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf
index 3adc2b98..a3399190 100644
--- a/remote/modules/pam/pam.conf
+++ b/remote/modules/pam/pam.conf
@@ -9,7 +9,6 @@ REQUIRED_INSTALLED_PACKAGES="
 	ldap-utils
 	libnfsidmap2
 	nfs-common
-	nscd
 "
 REQUIRED_CONTENT_PACKAGES="
 	libpam0g
@@ -26,14 +25,12 @@ REQUIRED_CONTENT_PACKAGES="
 	ldap-utils
 	libnfsidmap2
 	nfs-common
-	nscd
 "
 REQUIRED_BINARIES="
 	rpc.gssd
 	rpc.idmapd
 	sslconnect
 	ldapsearch
-	nscd
 "
 REQUIRED_LIBRARIES="
 	nsswitch
-- 
cgit v1.2.3-55-g7522