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