Attachment 9109 Details for Bug 44117 – Proposed patch

[patch] Proposed patch

bug44117.patch (text/plain), 1.50 KB, created by Alexander Kläser on 2017-08-09 16:24:55 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Kläser

Created: 2017-08-09 16:24:55 CEST

Size: 1.50 KB

patch

obsolete

>diff --git a/management/univention-appcenter/conffiles/create_portal_entries.py b/management/univention-appcenter/conffiles/create_portal_entries.py
>index 2f5f0e8..9ba55ce 100644
>--- a/management/univention-appcenter/conffiles/create_portal_entries.py
>+++ b/management/univention-appcenter/conffiles/create_portal_entries.py
>@@ -85,15 +85,21 @@ def _handler(ucr, changes):
> 		return
> 	lo, pos = get_machine_connection()
> 	pos.setDn('cn=portal,cn=univention,%s' % ucr.get('ldap/base'))
>-	interfaces = Interfaces(ucr)
> 	hostname = '%s.%s' % (ucr.get('hostname'), ucr.get('domainname'))
>-	default_ipv4_address = interfaces.get_default_ipv4_address()
>-	if default_ipv4_address:
>-		default_ipv4_address = str(default_ipv4_address.ip)
>-	default_ipv6_address = interfaces.get_default_ipv6_address()
>-	if default_ipv6_address:
>-		default_ipv6_address = str(default_ipv6_address.ip)
>-	local_hosts = [hostname, default_ipv4_address, default_ipv6_address]
>+
>+	# iterate over all ipv4 and ipv6 addresses and append them to the link
>+	local_hosts = [hostname]
>+	interfaces = Interfaces(ucr)
>+	for idev, iconf in interfaces.all_interfaces:
>+		# get ipv4 address of device
>+		if iconf.get('address'):
>+			local_hosts.append(iconf['address'])
>+
>+		# get ipv6 addresses of device
>+		for ikey, ival in iconf.iteritems():
>+			if ikey.startswith('ipv6/') and ikey.endswith('/address'):
>+				local_hosts.append('[%s]' % (iconf[ikey], ))
>+
> 	portal_logger.debug('Local hosts are: %r' % local_hosts)
> 	attr_entries = {}
> 	for changed_entry in changed_entries:

Actions: View | Diff

Attachments on bug 44117: 8674 | 9109