Attachment #2779 for bug #18696

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

Lines 35-40 Link Here

(-)univention-dvs/82univention-dvs-schema.inst (-1 / +7 lines)
35		35
36	eval "$(univention-config-registry shell ldap/base windows/domain server/role ldap/master)"	36	eval "$(univention-config-registry shell ldap/base windows/domain server/role ldap/master)"
37		37
		38	univention-directory-manager groups/group create "$@" \
		39	--ignore_exists \
		40	--position="cn=groups,$ldap_base" \
		41	--set name="DVS Nodes" \
		42	--set UVMMGroup=1
		43
38	# create required containers if neccessary	44	# create required containers if neccessary
39	univention-directory-manager container/cn create "$@" \	45	univention-directory-manager container/cn create "$@" \
40	--ignore_exists \	46	--ignore_exists \
Lines 397-403 Link Here
397		403
398	touch /etc/dvs-domainlogon.secret	404	touch /etc/dvs-domainlogon.secret
399	chmod 640 /etc/dvs-domainlogon.secret	405	chmod 640 /etc/dvs-domainlogon.secret
400	chgrp "Domain Admins" /etc/dvs-domainlogon.secret # TODO: Bug #18629	406	chgrp "DVS Nodes" /etc/dvs-domainlogon.secret
401	echo -n "$dvs_password" >/etc/dvs-domainlogon.secret	407	echo -n "$dvs_password" >/etc/dvs-domainlogon.secret
402	}	408	}
403		409

Lines 35-43 Link Here

(-)univention-dvs-node/70univention-dvs-node.inst (-2 / +1 lines)
35		35
36	eval "$(univention-config-registry shell)"	36	eval "$(univention-config-registry shell)"
37		37
38	# TODO: this should be fixed with Bug #18629
39	univention-directory-manager groups/group modify "$@" \	38	univention-directory-manager groups/group modify "$@" \
40	--dn "cn=Domain Admins,cn=groups,$ldap_base" \	39	--dn "cn=DVS Nodes,cn=groups,$ldap_base" \
41	--ignore_exists \	40	--ignore_exists \
42	--append hosts="$ldap_hostdn"	41	--append hosts="$ldap_hostdn"
43		42

Lines 2-8 Link Here

(-)univention-dvs-sysprep/debian/univention-dvs-sysprep.univention-config-registry (-2 / +2 lines)
2	File: var/lib/dvs-sysprep/sysprep/uni-join.bat	2	File: var/lib/dvs-sysprep/sysprep/uni-join.bat
3	Mode: 0640	3	Mode: 0640
4	User: dvs-domainlogon	4	User: dvs-domainlogon
5	Group: Domain Admins	5	Group: DVS Nodes
6	Variables: hostname	6	Variables: hostname
7	Variables: dvs/joinuser	7	Variables: dvs/joinuser
8	Variables: windows/domain	8	Variables: windows/domain
Lines 11-17 Link Here
11	File: var/lib/dvs-sysprep/sysprep-settings/local-settings.bat	11	File: var/lib/dvs-sysprep/sysprep-settings/local-settings.bat
12	Mode: 0640	12	Mode: 0640
13	User: dvs-domainlogon	13	User: dvs-domainlogon
14	Group: Domain Admins	14	Group: DVS Nodes
15	Variables: windows/domain	15	Variables: windows/domain
16	Variables: dvs/joinuser	16	Variables: dvs/joinuser
17	Variables: dvs/localgroup	17	Variables: dvs/localgroup

Lines 51-57 Link Here

(-)univention-dvs-sysprep/85univention-dvs-sysprep.inst (-1 / +1 lines)
51	--set owner=0 \	51	--set owner=0 \
52	--set group=0 \	52	--set group=0 \
53	--set directorymode=0755 \	53	--set directorymode=0755 \
54	--set sambaValidUsers='dvs-domainlogon,"@Domain Admins"' # TODO: Bug #18629	54	--set sambaValidUsers='dvs-domainlogon,"@DVS Nodes"'
55		55
56	i=0	56	i=0
57	while univention-scp /etc/machine.secret "${hostname}\$@${ldap_master}:/etc/dvs-domainlogon.secret" /etc/dvs-domainlogon.secret 2>&1\| grep -q 'Permission denied'; do	57	while univention-scp /etc/machine.secret "${hostname}\$@${ldap_master}:/etc/dvs-domainlogon.secret" /etc/dvs-domainlogon.secret 2>&1\| grep -q 'Permission denied'; do




import shutil
import subprocess
import sys
import grp

import univention.admin.uldap as uldap # exception variant
import univention.admin.modules

		fd = open(path, 'wb')
		pickle.dump( self.domain, fd )
		fd.close()
		os.chmod(path, 0440) # Bug 20454
		os.chown(path, -1, grp.getgrnam('DVS Nodes').gr_gid)
		self.object[ 'available' ] = 'TRUE'
		self.object.modify()


				ud.debug( ud.ADMIN, ud.INFO, 'move: %s -> %s' % ( disk.source, dest ) )
				if restore:
					restore_disks.append( ( dest, disk.source ) )
				os.chmod(dest, 0440) # Bug 20454
				os.chown(dest, -1, grp.getgrnam('DVS Nodes').gr_gid)
				disk.source = dest

		self.object[ 'path' ] = path

Return to bug 18696

Lines 40-45 Link Here

(-)univention-dvs-node/univention-dvs-template-create (-2 / +5 lines)
40	import shutil	40	import shutil
41	import subprocess	41	import subprocess
42	import sys	42	import sys
		43	import grp
43		44
44	import univention.admin.uldap as uldap # exception variant	45	import univention.admin.uldap as uldap # exception variant
45	import univention.admin.modules	46	import univention.admin.modules
Lines 82-88 Link Here
82	fd = open(path, 'wb')	83	fd = open(path, 'wb')
83	pickle.dump( self.domain, fd )	84	pickle.dump( self.domain, fd )
84	fd.close()	85	fd.close()
85	os.chmod(path, 0444) # Bug 20454	86	os.chmod(path, 0440) # Bug 20454
		87	os.chown(path, -1, grp.getgrnam('DVS Nodes').gr_gid)
86	self.object[ 'available' ] = 'TRUE'	88	self.object[ 'available' ] = 'TRUE'
87	self.object.modify()	89	self.object.modify()
88		90
Lines 127-133 Link Here
127	ud.debug( ud.ADMIN, ud.INFO, 'move: %s -> %s' % ( disk.source, dest ) )	129	ud.debug( ud.ADMIN, ud.INFO, 'move: %s -> %s' % ( disk.source, dest ) )
128	if restore:	130	if restore:
129	restore_disks.append( ( dest, disk.source ) )	131	restore_disks.append( ( dest, disk.source ) )
130	os.chmod(dest, 0444) # Bug 20454	132	os.chmod(dest, 0440) # Bug 20454
		133	os.chown(dest, -1, grp.getgrnam('DVS Nodes').gr_gid)
131	disk.source = dest	134	disk.source = dest
132		135
133	self.object[ 'path' ] = path	136	self.object[ 'path' ] = path