Attachment #5721 for bug #33890

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

Lines 23-30 Link Here

(-)univention-ldap/debian/control (-2 / +2 lines)
23	univention-ipcalc,	23	univention-ipcalc,
24	univention-ldap-acl-master \| univention-ldap-acl-slave,	24	univention-ldap-acl-master \| univention-ldap-acl-slave,
25	bind9-host,	25	bind9-host,
26	shell-univention-lib (>= 3.0.1-1),	26	shell-univention-lib (>= 3.0.26-14),
27	python-univention-lib (>= 3.0.12-4),	27	python-univention-lib (>= 3.0.26-14),
28	univention-newsid,	28	univention-newsid,
29	univention-join	29	univention-join
30	Conflicts: univention-5250 (<< 0.5),	30	Conflicts: univention-5250 (<< 0.5),




NETMASK="$(get_default_netmask)"
NETWORK="$(get_default_network)"

users_default_administrator=$(custom_username "Administrator")
groups_default_domainadmins=$(custom_groupname "Domain Admins")
groups_default_domainusers=$(custom_groupname "Domain Users")

reverse=$(univention-ipcalc6 --netmask "$NETMASK" --ip "$IP" --output reverse --calcdns)


		if [ -f /var/lib/univention-ldap/root.secret ] ; then
			# mailPrimaryAddress is required on ox systems
			if [ -n "$ox_primary_maildomain" ] ; then
				univention-directory-manager users/user create "$@" --position="cn=users,$ldap_base" --set mailPrimaryAddress="administrator@$ox_primary_maildomain" --set firstname="Admin" --set username="$users_default_administrator" --set sambaRID=500 --set unixhome="/home/$users_default_administrator" --set lastname="$users_default_administrator" --set password="$(cat /var/lib/univention-ldap/root.secret)" --set primaryGroup="cn=$groups_default_domainadmins,cn=groups,$ldap_base" --policy-reference "cn=default-admins,cn=admin-settings,cn=users,cn=policies,$ldap_base" || die
			else	
				univention-directory-manager users/user create "$@" --position="cn=users,$ldap_base" --set username="$users_default_administrator" --set sambaRID=500 --set unixhome="/home/$users_default_administrator" --set lastname="$users_default_administrator" --set password="$(cat /var/lib/univention-ldap/root.secret)" --set primaryGroup="cn=$groups_default_domainadmins,cn=groups,$ldap_base" --policy-reference "cn=default-admins,cn=admin-settings,cn=users,cn=policies,$ldap_base" || die
			fi
		fi
		univention-directory-manager groups/group modify "$@" --dn "cn=DC Backup Hosts,cn=groups,$ldap_base" --append users="uid=$users_default_administrator,cn=users,$ldap_base" || die
		univention-directory-manager groups/group modify "$@" --dn "cn=$groups_default_domainusers,cn=groups,$ldap_base" --append users="uid=$users_default_administrator,cn=users,$ldap_base" || die

		#create default network
		forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" | sed -ne 's/DN: //p;T;q')

Lines 1-4 Link Here

(-)univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-master (-3 / +6 lines)
1	@!@	1	@!@
		2	from univention.lib.misc import custom_username, custom_groupname
		3
2	ldap_base=baseConfig['ldap/base']	4	ldap_base=baseConfig['ldap/base']
3	ldap_port=baseConfig['slapd/port']	5	ldap_port=baseConfig['slapd/port']
4	if baseConfig['ldap/server/type']=="master":	6	if baseConfig['ldap/server/type']=="master":
Lines 6-12 Link Here
6	else:	8	else:
7	usr="read"	9	usr="read"
8		10
9	groups_default_domainadmins = configRegistry.get('groups/default/domainadmins', 'Domain Admins')	11	groups_default_domainadmins = custom_groupname('Domain Admins')
		12	users_default_administrator = custom_username('Administrator')
10		13
11	print 'sasl-regexp'	14	print 'sasl-regexp'
12	print ' uid=(.*),cn=gssapi,cn=auth'	15	print ' uid=(.*),cn=gssapi,cn=auth'
Lines 26-36 Link Here
26	print 'access to *'	29	print 'access to *'
27	print ' by sockname="PATH=/var/run/slapd/ldapi" %s' % (usr)	30	print ' by sockname="PATH=/var/run/slapd/ldapi" %s' % (usr)
28	print ' by dn.base="cn=admin,%s" %s' % ( ldap_base, usr)	31	print ' by dn.base="cn=admin,%s" %s' % ( ldap_base, usr)
29	print ' by dn.base="uid=Administrator,cn=users,%s" %s' % ( ldap_base, usr)	32	print ' by dn.base="uid=%s,cn=users,%s" %s' % ( users_default_administrator, ldap_base, usr)
30	print ' by * none break'	33	print ' by * none break'
31	print ''	34	print ''
32		35
33	print 'access to dn="uid=Administrator,cn=users,%s"' % ( ldap_base )	36	print 'access to dn="uid=%s,cn=users,%s"' % ( users_default_administrator, ldap_base )
34	print ' by group/univentionGroup/uniqueMember="cn=%s,cn=groups,%s" %s' % ( groups_default_domainadmins, ldap_base, usr)	37	print ' by group/univentionGroup/uniqueMember="cn=%s,cn=groups,%s" %s' % ( groups_default_domainadmins, ldap_base, usr)
35	print ' by dn.base="cn=admin,%s" %s' % ( ldap_base, usr)	38	print ' by dn.base="cn=admin,%s" %s' % ( ldap_base, usr)
36	print ' by self %s' % ( usr )	39	print ' by self %s' % ( usr )

Lines 10-16 Link Here

(-)univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-slave (-1 / +3 lines)
10	access to attrs=userPassword,krb5Key,sambaNTPassword,sambaLMPassword,sambaPwdLastSet,pwhistory,sambaPwdCanChange,sambaPwdMustChange,sambaPasswordHistory,sambaClearTextPassword,sambaPreviousClearTextPassword	10	access to attrs=userPassword,krb5Key,sambaNTPassword,sambaLMPassword,sambaPwdLastSet,pwhistory,sambaPwdCanChange,sambaPwdMustChange,sambaPasswordHistory,sambaClearTextPassword,sambaPreviousClearTextPassword
11	by sockname="PATH=/var/run/slapd/ldapi" read	11	by sockname="PATH=/var/run/slapd/ldapi" read
12	@!@	12	@!@
13	groups_default_domainadmins = configRegistry.get('groups/default/domainadmins', 'Domain Admins')	13	from univention.lib.misc import custom_groupname
		14
		15	groups_default_domainadmins = custom_groupname('Domain Admins')
14	ldap_base = configRegistry['ldap/base']	16	ldap_base = configRegistry['ldap/base']
15	print ' by group/univentionGroup/uniqueMember="cn=%s,cn=groups,%s" read' % ( groups_default_domainadmins, ldap_base )	17	print ' by group/univentionGroup/uniqueMember="cn=%s,cn=groups,%s" read' % ( groups_default_domainadmins, ldap_base )
16		18

Lines 1-12 Link Here

(-)univention-ldap/conffiles/etc/ldap/slapd.conf.d/70univention-ldap-server_acl-master-end (-2 / +4 lines)
1	@!@	1	@!@
		2	from univention.lib.misc import custom_groupname
		3
2	ldap_base = configRegistry['ldap/base']	4	ldap_base = configRegistry['ldap/base']
3	if configRegistry.get('ldap/server/type') == "master":	5	if configRegistry.get('ldap/server/type') == "master":
4	usr="write"	6	usr="write"
5	else:	7	else:
6	usr="read"	8	usr="read"
7		9
8	groups_default_domainadmins = configRegistry.get('groups/default/domainadmins', 'Domain Admins')	10	groups_default_domainadmins = custom_groupname('Domain Admins')
9	groups_default_windowshosts = configRegistry.get('groups/default/windowshosts', 'Windows Hosts')	11	groups_default_windowshosts = custom_groupname('Windows Hosts')
10		12
11	nestedGroups = configRegistry.is_true('ldap/acl/nestedgroups', True)	13	nestedGroups = configRegistry.is_true('ldap/acl/nestedgroups', True)
12		14

Lines 215-223 Link Here

(-)univention-ldap/debian/univention-ldap-server.postinst (-3 / +3 lines)
215		215
216	if [ "$1" = "configure" -a "$server_role" = "domaincontroller_master" ] && dpkg --compare-versions "$2" lt-nl 8.0.71-1; then	216	if [ "$1" = "configure" -a "$server_role" = "domaincontroller_master" ] && dpkg --compare-versions "$2" lt-nl 8.0.71-1; then
217		217
218	groups_default_authenticatedusers="${groups_default_authenticatedusers:-Authenticated Users}"	218	groups_default_authenticatedusers=$(custom_groupname "Authenticated Users")
219	groups_default_enterpriseadmins="${groups_default_enterpriseadmins:-Enterprise Admins}"	219	groups_default_enterpriseadmins=$(custom_groupname "Enterprise Admins")
220	groups_default_windowshosts="${groups_default_windowshosts:-Windows Hosts}"	220	groups_default_windowshosts=$(custom_groupname "Windows Hosts")
221		221
222	sambaSID="$(univention-ldapsearch -x sambaDomainName="$windows_domain" sambaSID \| sed -ne 's\|^sambaSID: \|\|p')"	222	sambaSID="$(univention-ldapsearch -x sambaDomainName="$windows_domain" sambaSID \| sed -ne 's\|^sambaSID: \|\|p')"
223	if [ -n "$sambaSID" ]; then	223	if [ -n "$sambaSID" ]; then

Lines 30-35 Link Here

(-)univention-ldap/test/listner-notifier-test (-2 / +3 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
		33	. /usr/share/univention-lib/base.sh
		34
33	cat << End	35	cat << End
34	Possible Tests:	36	Possible Tests:
35		37
Lines 119-126 Link Here
119		121
120	user () # create a users/user object	122	user () # create a users/user object
121	{	123	{
122	eval "$(ucr shell "groups/default/domainusers")"	124	groups_default_domainusers=$(custom_groupname "Domain Users")
123	groups_default_domainusers = "${groups_default_domainusers:-Domain Users}"
124	univention-admin "$module" create --set username="$rand1" --set lastname="$rand2" --set password=univention --set unixhome="/home/$rand1" --set primaryGroup="cn=$groups_default_domainusers,cn=groups,$ldap_base" --position="cn=users,$ldap_base"	125	univention-admin "$module" create --set username="$rand1" --set lastname="$rand2" --set password=univention --set unixhome="/home/$rand1" --set primaryGroup="cn=$groups_default_domainusers,cn=groups,$ldap_base" --position="cn=users,$ldap_base"
125	}	126	}
126		127

Return to bug 33890

Lines 54-61 Link Here

(-)univention-ldap/10univention-ldap-server.inst (-6 / +7 lines)
54	NETMASK="$(get_default_netmask)"	54	NETMASK="$(get_default_netmask)"
55	NETWORK="$(get_default_network)"	55	NETWORK="$(get_default_network)"
56		56
57	groups_default_domainadmins="${groups_default_domainadmins:-Domain Admins}"	57	users_default_administrator=$(custom_username "Administrator")
58	groups_default_domainusers="${groups_default_domainusers:-Domain Users}"	58	groups_default_domainadmins=$(custom_groupname "Domain Admins")
		59	groups_default_domainusers=$(custom_groupname "Domain Users")
59		60
60	reverse=$(univention-ipcalc6 --netmask "$NETMASK" --ip "$IP" --output reverse --calcdns)	61	reverse=$(univention-ipcalc6 --netmask "$NETMASK" --ip "$IP" --output reverse --calcdns)
61		62
Lines 231-243 Link Here
231	if [ -f /var/lib/univention-ldap/root.secret ] ; then	232	if [ -f /var/lib/univention-ldap/root.secret ] ; then
232	# mailPrimaryAddress is required on ox systems	233	# mailPrimaryAddress is required on ox systems
233	if [ -n "$ox_primary_maildomain" ] ; then	234	if [ -n "$ox_primary_maildomain" ] ; then
234	univention-directory-manager users/user create "$@" --position="cn=users,$ldap_base" --set mailPrimaryAddress="administrator@$ox_primary_maildomain" --set firstname="Admin" --set username=Administrator --set sambaRID=500 --set unixhome=/home/Administrator --set lastname=Administrator --set password="$(cat /var/lib/univention-ldap/root.secret)" --set primaryGroup="cn=$groups_default_domainadmins,cn=groups,$ldap_base" --policy-reference "cn=default-admins,cn=admin-settings,cn=users,cn=policies,$ldap_base" \|\| die	235	univention-directory-manager users/user create "$@" --position="cn=users,$ldap_base" --set mailPrimaryAddress="administrator@$ox_primary_maildomain" --set firstname="Admin" --set username="$users_default_administrator" --set sambaRID=500 --set unixhome="/home/$users_default_administrator" --set lastname="$users_default_administrator" --set password="$(cat /var/lib/univention-ldap/root.secret)" --set primaryGroup="cn=$groups_default_domainadmins,cn=groups,$ldap_base" --policy-reference "cn=default-admins,cn=admin-settings,cn=users,cn=policies,$ldap_base" \|\| die
235	else	236	else
236	univention-directory-manager users/user create "$@" --position="cn=users,$ldap_base" --set username=Administrator --set sambaRID=500 --set unixhome=/home/Administrator --set lastname=Administrator --set password="$(cat /var/lib/univention-ldap/root.secret)" --set primaryGroup="cn=$groups_default_domainadmins,cn=groups,$ldap_base" --policy-reference "cn=default-admins,cn=admin-settings,cn=users,cn=policies,$ldap_base" \|\| die	237	univention-directory-manager users/user create "$@" --position="cn=users,$ldap_base" --set username="$users_default_administrator" --set sambaRID=500 --set unixhome="/home/$users_default_administrator" --set lastname="$users_default_administrator" --set password="$(cat /var/lib/univention-ldap/root.secret)" --set primaryGroup="cn=$groups_default_domainadmins,cn=groups,$ldap_base" --policy-reference "cn=default-admins,cn=admin-settings,cn=users,cn=policies,$ldap_base" \|\| die
237	fi	238	fi
238	fi	239	fi
239	univention-directory-manager groups/group modify "$@" --dn "cn=DC Backup Hosts,cn=groups,$ldap_base" --append users="uid=Administrator,cn=users,$ldap_base" \|\| die	240	univention-directory-manager groups/group modify "$@" --dn "cn=DC Backup Hosts,cn=groups,$ldap_base" --append users="uid=$users_default_administrator,cn=users,$ldap_base" \|\| die
240	univention-directory-manager groups/group modify "$@" --dn "cn=$groups_default_domainusers,cn=groups,$ldap_base" --append users="uid=Administrator,cn=users,$ldap_base" \|\| die	241	univention-directory-manager groups/group modify "$@" --dn "cn=$groups_default_domainusers,cn=groups,$ldap_base" --append users="uid=$users_default_administrator,cn=users,$ldap_base" \|\| die
241		242
242	#create default network	243	#create default network
243	forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" \| sed -ne 's/DN: //p;T;q')	244	forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" \| sed -ne 's/DN: //p;T;q')