Attachment #10685 for bug #53064

View | Details | Raw Unified | Return to bug 53064
Collapse All | Expand All




@%@UCRWARNING=# @%@


controls{
        inet 127.0.0.1
@!@
allowed_controllers = {configRegistry.get('dns/master/address', '127.0.0.1'), '127.0.0.1'}
print('\t\tallow {{ {}; }};'.format('; '.join(sorted(allowed_controllers))))
@!@
};
options {
    directory "/var/cache/bind";

Lines 1-3 Link Here

(-)a/services/univention-bind/debian/changelog (+6 lines)
		1	univention-bind (14.0.0-15) unstable; urgency=medium
		2
		3	* fix wait time during setup
		4
		5	-- Jürn Brodersen <brodersen@univention.de> Tue, 30 Mar 2021 10:57:38 +0200
		6
1	univention-bind (14.0.0-14) unstable; urgency=medium	7	univention-bind (14.0.0-14) unstable; urgency=medium
2		8
3	* Bug #52885: Fix broken bind during package configuration phase	9	* Bug #52885: Fix broken bind during package configuration phase

Lines 32-37 Link Here

(-)a/services/univention-bind/debian/univention-bind.postinst (-2 / +5 lines)
32		32
33	. /usr/share/univention-lib/all.sh	33	. /usr/share/univention-lib/all.sh
34		34
		35	if [ "$1" = "configure" ]; then
		36	# touch config files just in case the listener module bind.py has not created them yet
		37	touch /etc/bind/univention.conf /etc/bind/univention.conf.proxy
		38	fi
		39
35	# Remove service diversion before any service is restarted through debhelper	40	# Remove service diversion before any service is restarted through debhelper
36	if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt 14.0.0-7; then	41	if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt 14.0.0-7; then
37	dpkg-divert --quiet \	42	dpkg-divert --quiet \
Lines 106-113 if [ "$1" = "configure" ]; then Link Here
106	systemctl --system daemon-reload	111	systemctl --system daemon-reload
107	service bind9 start	112	service bind9 start
108	}	113	}
109	# touch config files just in case the listener module bind.py has not created them yet
110	touch /etc/bind/univention.conf /etc/bind/univention.conf.proxy
111	if [ -n "$2" ]; then	114	if [ -n "$2" ]; then
112	systemctl try-restart bind9 \|\| service bind9 restart	115	systemctl try-restart bind9 \|\| service bind9 restart
113	else	116	else

Lines 17-22 Variables: dns/allow/query/cache Link Here

(-)a/services/univention-bind/debian/univention-bind.univention-config-registry (+1 lines)
17	Variables: dns/allow/transfer	17	Variables: dns/allow/transfer
18	Variables: dns/fakeroot	18	Variables: dns/fakeroot
19	Variables: dns/ipv6	19	Variables: dns/ipv6
		20	Variables: dns/master/address
20		21
21	Type: file	22	Type: file
22	File: etc/bind/named.conf.samba4	23	File: etc/bind/named.conf.samba4

Return to bug 53064

Lines 1-9 Link Here

(-)a/services/univention-bind/conffiles/etc/bind/named.conf.proxy (-2 / +4 lines)
1	@%@UCRWARNING=# @%@	1	@%@UCRWARNING=# @%@
2		2
3
4	controls{	3	controls{
5	inet 127.0.0.1	4	inet 127.0.0.1
6	allow { @%@dns/master/address@%@; };	5	@!@
		6	allowed_controllers = {configRegistry.get('dns/master/address', '127.0.0.1'), '127.0.0.1'}
		7	print('\t\tallow {{ {}; }};'.format('; '.join(sorted(allowed_controllers))))
		8	@!@
7	};	9	};
8	options {	10	options {
9	directory "/var/cache/bind";	11	directory "/var/cache/bind";