diff options
| author | Petr VobornÃk <pvoborni@redhat.com> | 2012-02-16 17:36:05 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2012-02-20 15:47:39 -0600 |
| commit | a7ced67e777f9a98a4315536a874b3dd8859498a (patch) | |
| tree | 11a77e1892df006e8f36da133522efa7b6b49b33 | |
| parent | a11f1bb2c2619970824c1eb8cabc4b9913ba7c54 (diff) | |
| download | freeipa-a7ced67e777f9a98a4315536a874b3dd8859498a.tar.gz freeipa-a7ced67e777f9a98a4315536a874b3dd8859498a.tar.xz freeipa-a7ced67e777f9a98a4315536a874b3dd8859498a.zip | |
Added missing configuration options
Missing options were added to Web UI's IPA Server/Configuration page.
* ipaconfigstring
* ipaselinuxusermaporder
* ipaselinuxusermapdefault
https://fedorahosted.org/freeipa/ticket/2285
https://fedorahosted.org/freeipa/ticket/2400
| -rw-r--r-- | install/ui/serverconfig.js | 13 | ||||
| -rw-r--r-- | install/ui/test/data/config_show.json | 8 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 1 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 1 |
4 files changed, 23 insertions, 0 deletions
diff --git a/install/ui/serverconfig.js b/install/ui/serverconfig.js index e6da7953a..2b9be6ede 100644 --- a/install/ui/serverconfig.js +++ b/install/ui/serverconfig.js @@ -60,6 +60,11 @@ IPA.config.entity = function(spec) { 'ipamaxusernamelength', 'ipapwdexpadvnotify', { + name: 'ipaconfigstring', + type: 'checkboxes', + options: IPA.create_options(['AllowLMhash','AllowNThash']) + }, + { type: 'checkbox', name: 'ipamigrationenabled' }, @@ -79,6 +84,14 @@ IPA.config.entity = function(spec) { name: 'ipagroupobjectclasses' } ] + }, + { + name: 'selinux', + label: IPA.messages.objects.config.selinux, + fields: [ + 'ipaselinuxusermaporder', + 'ipaselinuxusermapdefault' + ] } ], needs_update: true diff --git a/install/ui/test/data/config_show.json b/install/ui/test/data/config_show.json index 1b6d59418..be3edc2d3 100644 --- a/install/ui/test/data/config_show.json +++ b/install/ui/test/data/config_show.json @@ -20,6 +20,8 @@ "ipapwdexpadvnotify": "rscwo", "ipasearchrecordslimit": "rscwo", "ipasearchtimelimit": "rscwo", + "ipaselinuxusermapdefault": "rscwo", + "ipaselinuxusermaporder": "rscwo", "ipauserobjectclasses": "rscwo", "ipausersearchfields": "rscwo", "nsaccountlock": "rscwo", @@ -72,6 +74,12 @@ "ipasearchtimelimit": [ "2" ], + "ipaselinuxusermapdefault": [ + "guest_u:s0" + ], + "ipaselinuxusermaporder": [ + "guest_u:s0$xguest_u:s0$user_u:s0-s0:c0.c1023$staff_u:s0-s0:c0.c1023$unconfined_u:s0-s0:c0.c1023" + ], "ipauserobjectclasses": [ "top", "person", diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 740307f7a..267ab5c9f 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -179,6 +179,7 @@ "config": { "group": "Group Options", "search": "Search Options", + "selinux": "SELinux Options", "user": "User Options" }, "delegation": {}, diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 8623e61a8..f3f813b1d 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -315,6 +315,7 @@ class i18n_messages(Command): "config": { "group": _("Group Options"), "search": _("Search Options"), + "selinux": _("SELinux Options"), "user": _("User Options"), }, "delegation": { |