From 340e093b31da702ce3ce5da79a8b3e93557e75ee Mon Sep 17 00:00:00 2001 From: Serhii Tsymbaliuk Date: Jul 26 2019 18:22:09 +0000 Subject: WebUI: Add PKINIT status field to 'Configuration' page - Add 'Server Options' section to the page - Add 'IPA master capable of PKINIT' field to the 'Server Options' Ticket: https://pagure.io/freeipa/issue/7305 Signed-off-by: Serhii Tsymbaliuk Reviewed-By: Florence Blanc-Renaud --- diff --git a/install/ui/src/freeipa/serverconfig.js b/install/ui/src/freeipa/serverconfig.js index 25f484a..6c82b40 100644 --- a/install/ui/src/freeipa/serverconfig.js +++ b/install/ui/src/freeipa/serverconfig.js @@ -50,6 +50,24 @@ return { ] }, { + name: 'server', + label: '@i18n:objects.config.server', + fields: [ + { + $type: 'entity_select', + name: 'ca_renewal_master_server', + other_entity: 'server', + other_field: 'cn', + flags: ['w_if_no_aci'] + }, + { + $type: 'multivalued', + name: 'pkinit_server_server', + read_only: true + } + ] + }, + { name: 'user', label: '@i18n:objects.config.user', fields: [ @@ -99,13 +117,6 @@ return { { $type: 'multivalued', name: 'ipauserobjectclasses' - }, - { - $type: 'entity_select', - name: 'ca_renewal_master_server', - other_entity: 'server', - other_field: 'cn', - flags: ['w_if_no_aci'] } ] }, diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index 9ed44cc..ffc6ba2 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -726,6 +726,7 @@ class i18n_messages(Command): "group": _("Group Options"), "search": _("Search Options"), "selinux": _("SELinux Options"), + "server": _("Server Options"), "service": _("Service Options"), "user": _("User Options"), },