View | Details | Raw Unified | Return to bug 51421 | Differences between
and this patch

Collapse All | Expand All

(-)a/services/univention-bind/debian/rules (-1 / +7 lines)
Lines 34-38 override_dh_auto_install: Link Here
34
	dh_auto_install
34
	dh_auto_install
35
	univention-install-config-registry
35
	univention-install-config-registry
36
36
37
override_dh_systemd_enable:
38
	dh_systemd_enable --name=univention-bind-ldap --no-enable
39
40
override_dh_systemd_start:
41
	dh_systemd_start --no-start --no-restart-on-upgrade
42
37
%:
43
%:
38
	dh $@
44
	dh $@ --with systemd
(-)a/services/univention-bind/debian/univention-bind.install (-1 lines)
Lines 4-7 etc/bind/db.root.fake etc/bind Link Here
4
90univention-bind-post.inst usr/lib/univention-install
4
90univention-bind-post.inst usr/lib/univention-install
5
usr/lib/univention-server/server_password_change.d/univention-bind usr/lib/univention-server/server_password_change.d/
5
usr/lib/univention-server/server_password_change.d/univention-bind usr/lib/univention-server/server_password_change.d/
6
usr/lib/univention-bind
6
usr/lib/univention-bind
7
lib/systemd/system
(-)a/services/univention-bind/debian/univention-bind.postinst (+6 lines)
Lines 38-43 if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt 14.0.0-2; then Link Here
38
		--package univention-bind \
38
		--package univention-bind \
39
		--divert /lib/systemd/system/bind9.service.debian \
39
		--divert /lib/systemd/system/bind9.service.debian \
40
		--rename --remove /lib/systemd/system/bind9.service
40
		--rename --remove /lib/systemd/system/bind9.service
41
42
	if [ -f /etc/bind/rndc.key ]
43
	then
44
		chown root:bind /etc/bind/rndc.key
45
		chmod 0640 /etc/bind/rndc.key
46
	fi
41
fi
47
fi
42
48
43
#DEBHELPER#
49
#DEBHELPER#
(-)a/services/univention-bind/debian/univention-bind.tmpfile (+1 lines)
Line 0 Link Here
1
d	/run/named	0775	root	bind	10d	-
(-)a/services/univention-bind/usr/lib/univention-bind/ldap (-9 lines)
Lines 29-47 Link Here
29
29
30
case "$1" in
30
case "$1" in
31
	start)
31
	start)
32
		# dirs under /var/run can go away on reboots.
33
		mkdir -p /var/run/named
34
		chmod 775 /var/run/named
35
		chown root:bind /var/run/named >/dev/null 2>&1 || true
36
37
		PATH=/sbin:/bin:/usr/sbin:/usr/bin
32
		PATH=/sbin:/bin:/usr/sbin:/usr/bin
38
		debug_level="$(ucr get dns/debug/level)"
33
		debug_level="$(ucr get dns/debug/level)"
39
		test -z $debug_level && debug_level=0
34
		test -z $debug_level && debug_level=0
40
35
41
		# Give permissions back to bind,
42
		# see /usr/lib/univention-bind/samba4
43
		chown bind:bind /etc/bind/rndc.key
44
45
		port="$(ucr get dns/master/port)"
36
		port="$(ucr get dns/master/port)"
46
37
47
		OPTS="-c /etc/bind/named.conf -p $port -u bind -f -d $debug_level"
38
		OPTS="-c /etc/bind/named.conf -p $port -u bind -f -d $debug_level"
(-)a/services/univention-bind/usr/lib/univention-bind/proxy (-9 lines)
Lines 29-47 Link Here
29
29
30
case "$1" in
30
case "$1" in
31
	start)
31
	start)
32
		# dirs under /var/run can go away on reboots.
33
		mkdir -p /var/run/named
34
		chmod 775 /var/run/named
35
		chown root:bind /var/run/named >/dev/null 2>&1 || true
36
37
		PATH=/sbin:/bin:/usr/sbin:/usr/bin
32
		PATH=/sbin:/bin:/usr/sbin:/usr/bin
38
		debug_level="$(ucr get dns/debug/level)"
33
		debug_level="$(ucr get dns/debug/level)"
39
		test -z $debug_level && debug_level=0
34
		test -z $debug_level && debug_level=0
40
35
41
		# Give permissions back to bind,
42
		# see /usr/lib/univention-bind/samba4
43
		chown bind:bind /etc/bind/rndc.key
44
45
		OPTS="-c /etc/bind/named.conf.proxy -u bind -f -d $debug_level"
36
		OPTS="-c /etc/bind/named.conf.proxy -u bind -f -d $debug_level"
46
37
47
		max_socks="$(ucr get dns/max-socks)"
38
		max_socks="$(ucr get dns/max-socks)"
(-)a/services/univention-bind/usr/lib/univention-bind/samba4 (-10 lines)
Lines 29-47 Link Here
29
29
30
case "$1" in
30
case "$1" in
31
	start)
31
	start)
32
		# dirs under /var/run can go away on reboots.
33
		mkdir -p /var/run/named
34
		chmod 775 /var/run/named
35
		chown root:bind /var/run/named >/dev/null 2>&1 || true
36
37
		PATH=/sbin:/bin:/usr/sbin:/usr/bin
32
		PATH=/sbin:/bin:/usr/sbin:/usr/bin
38
		debug_level="$(ucr get dns/debug/level)"
33
		debug_level="$(ucr get dns/debug/level)"
39
		test -z $debug_level && debug_level=0
34
		test -z $debug_level && debug_level=0
40
35
41
		# bind is running as root when using s4 as backend.
42
		# To open the rndc port, the rndc.key must be owned by root.
43
		chown root:root /etc/bind/rndc.key
44
45
		if [ "$(uname -m)" = "x86_64" ]; then
36
		if [ "$(uname -m)" = "x86_64" ]; then
46
			export LDB_MODULES_PATH=/usr/lib/x86_64-linux-gnu/ldb/
37
			export LDB_MODULES_PATH=/usr/lib/x86_64-linux-gnu/ldb/
47
		else
38
		else
48
- 

Return to bug 51421