Attachment 10085 Details for Bug 49384 – patch (git:fbest/49384-license-request)

[patch] patch (git:fbest/49384-license-request)

49384.patch (text/plain), 1.78 KB, created by Florian Best on 2019-06-25 13:19:05 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2019-06-25 13:19:05 CEST

Size: 1.78 KB

patch

obsolete

>diff --git a/base/univention-system-setup/usr/lib/univention-system-setup/cleanup-post.d/08_activate_license b/base/univention-system-setup/usr/lib/univention-system-setup/cleanup-post.d/08_activate_license
>index a13b2b5dde..d09090b36a 100755
>--- a/base/univention-system-setup/usr/lib/univention-system-setup/cleanup-post.d/08_activate_license
>+++ b/base/univention-system-setup/usr/lib/univention-system-setup/cleanup-post.d/08_activate_license
>@@ -36,7 +36,7 @@ eval "$(univention-config-registry shell)"
> email=$(get_profile_var email_address)
> if [ "$server_role" = "domaincontroller_master" -a -n "$email" ]; then
> 	echo "Activating the UCS license with the email address $email..."
>-	/usr/sbin/umc-command -r -U "$hostname\$" -y /etc/machine.secret udm/request_new_license -o email="$email"
>+	/usr/sbin/umc-command -r -U "$hostname\$" -y /etc/machine.secret udm/request_new_license -f license-request -o email="$email"
> 	echo "... done"
> fi
> 
>diff --git a/management/univention-management-console-module-udm/umc/udm.xml b/management/univention-management-console-module-udm/umc/udm.xml
>index 4556fbc299..a74914d533 100644
>--- a/management/univention-management-console-module-udm/umc/udm.xml
>+++ b/management/univention-management-console-module-udm/umc/udm.xml
>@@ -261,6 +261,15 @@
> 				<requiredCommand name="udm/license/import"/>
> 			</requiredCommands>
> 		</flavor>
>+		<flavor priority="50" id="license-request">
>+			<name>UCS license request</name>
>+			<description>Request new license</description>
>+			<keywords></keywords>
>+			<categories/>
>+			<requiredCommands>
>+				<requiredCommand name="udm/request_new_license"/>
>+			</requiredCommands>
>+		</flavor>
> 		<flavor priority="50" id="settings/portal_all">
> 			<name>Portal settings</name>
> 			<description>Management of portals and their entries</description>

Actions: View | Diff

Attachments on bug 49384: 10084 | 10085