Attachment #10391 for bug #51421

Lines 11-17 Wants=samba-ad-dc.service Link Here

(-)a/services/univention-bind/conffiles/etc/systemd/system/bind9.service.d/10-configure-backend.conf (-3 / +1 lines)
11	Conflicts=univention-bind-ldap.service	11	Conflicts=univention-bind-ldap.service
12		12
13	[Service]	13	[Service]
14	# Stop univention-bind-ldap.service if needed
15	Type=simple	14	Type=simple
16	ExecStart=	15	ExecStart=
17	ExecStart=/usr/lib/univention-bind/samba4 start	16	ExecStart=/usr/lib/univention-bind/samba4 start
Lines 25-32 elif dns_backend == 'ldap': Link Here
25	print('''	24	print('''
26	[Unit]	25	[Unit]
27	Description=BIND Domain Name Server proxy for LDAP backend	26	Description=BIND Domain Name Server proxy for LDAP backend
28	After=network.target	27	After=network.target univention-bind-ldap.service
29	Before=univention-bind-ldap.service
30	Wants=univention-bind-ldap.service	28	Wants=univention-bind-ldap.service
31	PropagatesReloadTo=univention-bind-ldap.service	29	PropagatesReloadTo=univention-bind-ldap.service
32		30

Lines 27-34 Link Here

(-)a/services/univention-bind/conffiles/systemctl_daemon-reload.py (+8 lines)
27	# /usr/share/common-licenses/AGPL-3; if not, see	27	# /usr/share/common-licenses/AGPL-3; if not, see
28	# <https://www.gnu.org/licenses/>.	28	# <https://www.gnu.org/licenses/>.
29		29
		30	from os import unlink
30	from subprocess import call	31	from subprocess import call
31		32
		33	COND = '/var/lib/univention-bind/ldap'
		34
32		35
33	def postinst(ucr, changes):	36	def postinst(ucr, changes):
		37	dns_backend = ucr.get('dns/backend', 'ldap').lower()
		38	with open(COND, 'w') as fd:
		39	if dns_backend == 'ldap':
		40	fd.write('1')
		41
34	call(['systemctl', 'daemon-reload'])	42	call(['systemctl', 'daemon-reload'])

Lines 19-25 Depends: Link Here

(-)a/services/univention-bind/debian/control (-1 lines)
19	univention-join (>= 9.0.3-11),	19	univention-join (>= 9.0.3-11),
20	univention-role-server-common (>= 12.0.0-8) \| univention-container-role-server-common,	20	univention-role-server-common (>= 12.0.0-8) \| univention-container-role-server-common,
21	${misc:Depends},	21	${misc:Depends},
22	${python:Depends},
23	Description: UCS - DNS server	22	Description: UCS - DNS server
24	This package installs a DNS server that receives its zone	23	This package installs a DNS server that receives its zone
25	information from LDAP or from Samba 4.	24	information from LDAP or from Samba 4.




# /usr/share/common-licenses/AGPL-3; if not, see
# <https://www.gnu.org/licenses/>.

#clean:
#	rm -f *~ univention-name-to-unicode

override_dh_auto_clean:
	dh_auto_clean
	rm -f debian/univention-bind.conffiles

override_dh_auto_install:
	dh_auto_install
	univention-install-config-registry

override_dh_systemd_enable:
	dh_systemd_enable --name=univention-bind-ldap

%:
	dh $@ --with systemd

Lines 1-7 Link Here

(-)a/services/univention-bind/lib/systemd/system/univention-bind-ldap.service (-1 / +4 lines)
1	[Unit]	1	[Unit]
2	Description=BIND Domain Name Server with LDAP backend	2	Description=BIND Domain Name Server with LDAP backend
3	Documentation=man:named(8)	3	Documentation=man:named(8)
4	After=network.target slapd.service bind9.service	4	ConditionFileNotEmpty=/var/lib/univention-bind/ldap
		5	After=network.target slapd.service
		6	Requires=slapd.service
		7	Before=bind9.service
5	PartOf=bind9.service	8	PartOf=bind9.service
6		9
7	[Service]	10	[Service]

Line 1 Link Here

(-)a/services/univention-bind/debian/univention-bind.dirs (-1 / +1 lines)
1	var/cache/univention-bind-proxy	1	var/cache/univention-bind-proxy
2	-	2	var/lib/univention-bind

Return to bug 51421

Lines 30-45 Link Here

(-)a/services/univention-bind/debian/rules (-8 / +4 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <https://www.gnu.org/licenses/>.	31	# <https://www.gnu.org/licenses/>.
32		32
33	#clean:
34	# rm -f *~ univention-name-to-unicode
35
36	override_dh_auto_clean:
37	dh_auto_clean
38	rm -f debian/univention-bind.conffiles
39
40	override_dh_auto_install:	33	override_dh_auto_install:
41	dh_auto_install	34	dh_auto_install
42	univention-install-config-registry	35	univention-install-config-registry
43		36
		37	override_dh_systemd_enable:
		38	dh_systemd_enable --name=univention-bind-ldap
		39
44	%:	40	%:
45	dh $@	41	dh $@ --with systemd