Merge branch 'master' of dnbd3:openslx-ng/tm-scripts

8 files changed, 144 insertions, 3 deletions

diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf
index feb09723..8728c4bf 100644
--- a/remote/modules/debug/debug.conf
+++ b/remote/modules/debug/debug.conf
@@ -2,6 +2,9 @@ REQUIRED_INSTALLED_PACKAGES="
 	curl
 	ltrace
 	nano
+	fontconfig
+	fonts-config
+	xset
 "
 REQUIRED_BINARIES="
 	strace
@@ -10,4 +13,9 @@ REQUIRED_BINARIES="
 	setterm
 	curl
 	nano
+	fc-cache
+	fc-query
+	fonts-config
+	xset
+	locale
 "
diff --git a/remote/modules/german/german.conf b/remote/modules/german/german.conf
index ec22c760..5b27bed0 100644
--- a/remote/modules/german/german.conf
+++ b/remote/modules/german/german.conf
@@ -1,7 +1,11 @@
-REQUIRED_CONTENT_PACKAGES=""
+REQUIRED_INSTALLED_PACKAGES="
+		libX11-data"
+REQUIRED_CONTENT_PACKAGES="
+		libX11-data"
+REQUIRED_LIBRARIES="libX11-data"
 REQUIRED_BINARIES=""
 REQUIRED_FILES=""
 REQUIRED_DIRECTORIES="
-	/usr/lib/locale/de_DE.utf8
+		/usr/lib/locale/de_DE.utf8
+		/usr/share/X11
 "
-
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/systemd/system/multi-user.target.wants/nscd.service b/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service
new file mode 120000
index 00000000..70066631
--- /dev/null
+++ b/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service
@@ -0,0 +1 @@
+../nscd.service
\ No newline at end of file
diff --git a/remote/modules/pam/data/etc/systemd/system/nscd.service b/remote/modules/pam/data/etc/systemd/system/nscd.service
new file mode 100644
index 00000000..262bb534
--- /dev/null
+++ b/remote/modules/pam/data/etc/systemd/system/nscd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Name Service Cache Daemon
+
+[Service]
+ExecStart=/usr/sbin/nscd -d
+ExecStop=/usr/sbin/nscd --shutdown
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Also=nscd.socket