From a7ced67e777f9a98a4315536a874b3dd8859498a Mon Sep 17 00:00:00 2001
From: Petr Voborník <pvoborni@redhat.com>
Date: Thu, 16 Feb 2012 17:36:05 +0100
Subject: 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
---
 install/ui/serverconfig.js            | 13 +++++++++++++
 install/ui/test/data/config_show.json |  8 ++++++++
 install/ui/test/data/ipa_init.json    |  1 +
 3 files changed, 22 insertions(+)

(limited to 'install')

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
@@ -59,6 +59,11 @@ IPA.config.entity = function(spec) {
                         'ipadefaultloginshell',
                         '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": {},
-- 
cgit