diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-01-06 01:18:48 -0600 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2012-01-13 10:57:59 -0600 |
| commit | f56f8a34d39ba13403e7a693b639b6b37fcd0a04 (patch) | |
| tree | 6503617f5530db7332f9434302dd56f2cf672eca | |
| parent | 3d1b864024255b97999f100d05c3bf63d99dacb5 (diff) | |
| download | freeipa-f56f8a34d39ba13403e7a693b639b6b37fcd0a04.tar.gz freeipa-f56f8a34d39ba13403e7a693b639b6b37fcd0a04.tar.xz freeipa-f56f8a34d39ba13403e7a693b639b6b37fcd0a04.zip | |
Added instructions to generate CSR.
The certificate request dialog box has been modified to show
the OpenSSL commands for generating a CSR.
The realm and entry names in the test data have been fixed to
be more consistent.
Ticket #1012
109 files changed, 484 insertions, 527 deletions
diff --git a/install/ui/certificate.js b/install/ui/certificate.js index 372edcdaa..70533c14d 100755 --- a/install/ui/certificate.js +++ b/install/ui/certificate.js @@ -437,8 +437,9 @@ IPA.cert.request_dialog = function(spec) { var that = IPA.dialog(spec); - that.width = spec.width || 500; - that.height = spec.height || 400; + that.width = spec.width || 600; + that.height = spec.height || 450; + that.message = spec.message; that.request = spec.request; @@ -466,14 +467,11 @@ IPA.cert.request_dialog = function(spec) { }); that.create = function() { - that.container.append(IPA.messages.objects.cert.enter_csr+':'); - that.container.append('<br/>'); - that.container.append('<br/>'); + that.container.append(that.message); that.textarea = $('<textarea/>', { style: 'width: 100%; height: 225px;' }).appendTo(that.container); - }; return that; @@ -829,8 +827,9 @@ IPA.cert.status_widget = function(spec) { title = title.replace('${primary_key}', entity_name); var dialog = IPA.cert.request_dialog({ - 'title': title, - 'request': function(values) { + title: title, + message: that.request_message, + request: function(values) { var request = values['request']; IPA.command({ diff --git a/install/ui/host.js b/install/ui/host.js index 88635955c..b6b1ebf39 100644 --- a/install/ui/host.js +++ b/install/ui/host.js @@ -861,14 +861,35 @@ IPA.host_password_field = function (spec) { IPA.widget_factories['host_password'] = IPA.host_password_widget; IPA.field_factories['host_password'] = IPA.host_password_field; -IPA.host_certificate_status_widget = function (spec) { +IPA.host.certificate_status_field = function(spec) { + + spec = spec || {}; + + var that = IPA.cert.status_field(spec); + + that.load = function(result) { + + that.widget.result = result; + + var message = IPA.messages.objects.cert.request_message; + message = message.replace(/\$\{hostname\}/g, result.fqdn[0]); + message = message.replace(/\$\{realm\}/g, IPA.env.realm); + that.widget.request_message = message; + + that.reset(); + }; + + return that; +}; + +IPA.host.certificate_status_widget = function(spec) { spec = spec || {}; var that = IPA.cert.status_widget(spec); that.get_entity_pkey = function(result) { - var values = result['fqdn']; + var values = result.fqdn; return values ? values[0] : null; }; @@ -877,19 +898,19 @@ IPA.host_certificate_status_widget = function (spec) { }; that.get_entity_principal = function(result) { - var values = result['krbprincipalname']; + var values = result.krbprincipalname; return values ? values[0] : null; }; that.get_entity_certificate = function(result) { - var values = result['usercertificate']; + var values = result.usercertificate; return values ? values[0].__base64__ : null; }; return that; }; -IPA.widget_factories['host_certificate_status'] = IPA.host_certificate_status_widget; -IPA.field_factories['host_certificate_status'] = IPA.cert.status_field; +IPA.widget_factories['host_certificate_status'] = IPA.host.certificate_status_widget; +IPA.field_factories['host_certificate_status'] = IPA.host.certificate_status_field; IPA.register('host', IPA.host.entity); diff --git a/install/ui/service.js b/install/ui/service.js index e41da2f99..f60d45550 100644 --- a/install/ui/service.js +++ b/install/ui/service.js @@ -180,7 +180,7 @@ IPA.service_name_field = function(spec) { that.field_load(record); - var krbprincipalname = record['krbprincipalname'][0]; + var krbprincipalname = record.krbprincipalname[0]; var value = krbprincipalname.replace(/\/.*$/, ''); that.values = [value]; @@ -204,7 +204,7 @@ IPA.service_host_field = function(spec) { that.field_load(record); - var krbprincipalname = record['krbprincipalname'][0]; + var krbprincipalname = record.krbprincipalname[0]; var value = krbprincipalname.replace(/^.*\//, '').replace(/@.*$/, ''); that.values = [value]; @@ -362,14 +362,38 @@ IPA.service_provisioning_status_field = function (spec) { IPA.field_factories['service_provisioning_status'] = IPA.service_provisioning_status_field; IPA.widget_factories['service_provisioning_status'] = IPA.service_provisioning_status_widget; -IPA.service_certificate_status_widget = function (spec) { +IPA.service.certificate_status_field = function(spec) { + + spec = spec || {}; + + var that = IPA.cert.status_field(spec); + + that.load = function(result) { + + that.widget.result = result; + + var krbprincipalname = result.krbprincipalname[0]; + var hostname = krbprincipalname.replace(/^.*\//, '').replace(/@.*$/, ''); + + var message = IPA.messages.objects.cert.request_message; + message = message.replace(/\$\{hostname\}/g, hostname); + message = message.replace(/\$\{realm\}/g, IPA.env.realm); + that.widget.request_message = message; + + that.reset(); + }; + + return that; +}; + +IPA.service.certificate_status_widget = function(spec) { spec = spec || {}; var that = IPA.cert.status_widget(spec); that.get_entity_pkey = function(result) { - var values = result['krbprincipalname']; + var values = result.krbprincipalname; return values ? values[0] : null; }; @@ -383,14 +407,14 @@ IPA.service_certificate_status_widget = function (spec) { }; that.get_entity_certificate = function(result) { - var values = result['usercertificate']; + var values = result.usercertificate; return values ? values[0].__base64__ : null; }; return that; }; -IPA.widget_factories['service_certificate_status'] = IPA.service_certificate_status_widget; -IPA.field_factories['service_certificate_status'] = IPA.cert.status_field; +IPA.widget_factories['service_certificate_status'] = IPA.service.certificate_status_widget; +IPA.field_factories['service_certificate_status'] = IPA.service.certificate_status_field; IPA.register('service', IPA.service.entity); diff --git a/install/ui/test/data/automountkey_add.json b/install/ui/test/data/automountkey_add.json index c4e442d47..dd3ad10d1 100644 --- a/install/ui/test/data/automountkey_add.json +++ b/install/ui/test/data/automountkey_add.json @@ -12,7 +12,7 @@ "description": [ "/var/log/ipa mountinfogoeshere" ], - "dn": "description=/var/log/ipa mountinfogoeshere,automountmapname=auto.master,cn=default,cn=automount,dc=dev,dc=example,dc=com", + "dn": "description=/var/log/ipa mountinfogoeshere,automountmapname=auto.master,cn=default,cn=automount,dc=example,dc=com", "objectclass": [ "automount", "top" diff --git a/install/ui/test/data/automountkey_find.json b/install/ui/test/data/automountkey_find.json index 3123b551d..71de79d3b 100644 --- a/install/ui/test/data/automountkey_find.json +++ b/install/ui/test/data/automountkey_find.json @@ -14,7 +14,7 @@ "description": [ "nfsserver:/var/log/dirsrv /var/log/dirsrv" ], - "dn": "description=nfsserver:/var/log/dirsrv /var/log/dirsrv,automountmapname=auto.log,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "description=nfsserver:/var/log/dirsrv /var/log/dirsrv,automountmapname=auto.log,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automount", "top" @@ -30,7 +30,7 @@ "description": [ "nfsserver:/var/log/ipa /var/log/ipa" ], - "dn": "description=nfsserver:/var/log/ipa /var/log/ipa,automountmapname=auto.log,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "description=nfsserver:/var/log/ipa /var/log/ipa,automountmapname=auto.log,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automount", "top" diff --git a/install/ui/test/data/automountkey_show.json b/install/ui/test/data/automountkey_show.json index 599e2a5a0..e55a1efc2 100644 --- a/install/ui/test/data/automountkey_show.json +++ b/install/ui/test/data/automountkey_show.json @@ -20,7 +20,7 @@ "description": [ "/home auto.home" ], - "dn": "description=/home auto.home,automountmapname=auto.master,cn=default,cn=automount,dc=dev,dc=example,dc=com", + "dn": "description=/home auto.home,automountmapname=auto.master,cn=default,cn=automount,dc=example,dc=com", "objectclass": [ "automount", "top" diff --git a/install/ui/test/data/automountlocation_add.json b/install/ui/test/data/automountlocation_add.json index da0c871ac..41db8a717 100644 --- a/install/ui/test/data/automountlocation_add.json +++ b/install/ui/test/data/automountlocation_add.json @@ -6,7 +6,7 @@ "cn": [ "YYZ" ], - "dn": "cn=yyz,cn=automount,dc=dev,dc=example,dc=com", + "dn": "cn=yyz,cn=automount,dc=example,dc=com", "objectclass": [ "nscontainer", "top" diff --git a/install/ui/test/data/automountmap_add.json b/install/ui/test/data/automountmap_add.json index 77db2c3d0..d3e88c55b 100644 --- a/install/ui/test/data/automountmap_add.json +++ b/install/ui/test/data/automountmap_add.json @@ -6,7 +6,7 @@ "automountmapname": [ "auto.log" ], - "dn": "automountmapname=auto.log,cn=mtv,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=auto.log,cn=mtv,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" diff --git a/install/ui/test/data/automountmap_add_indirect.json b/install/ui/test/data/automountmap_add_indirect.json index c2efba4a8..d9e3800ae 100644 --- a/install/ui/test/data/automountmap_add_indirect.json +++ b/install/ui/test/data/automountmap_add_indirect.json @@ -9,7 +9,7 @@ "description": [ "test" ], - "dn": "automountmapname=test,cn=default,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=test,cn=default,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" diff --git a/install/ui/test/data/automountmap_find.json b/install/ui/test/data/automountmap_find.json index aaa0d71cf..f88d2c2e7 100644 --- a/install/ui/test/data/automountmap_find.json +++ b/install/ui/test/data/automountmap_find.json @@ -8,7 +8,7 @@ "automountmapname": [ "auto.direct" ], - "dn": "automountmapname=auto.direct,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=auto.direct,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" @@ -18,7 +18,7 @@ "automountmapname": [ "auto.home" ], - "dn": "automountmapname=auto.home,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=auto.home,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" @@ -28,7 +28,7 @@ "automountmapname": [ "auto.log" ], - "dn": "automountmapname=auto.log,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=auto.log,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" @@ -38,7 +38,7 @@ "automountmapname": [ "auto.master" ], - "dn": "automountmapname=auto.master,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=auto.master,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" diff --git a/install/ui/test/data/automountmap_find_pkeys.json b/install/ui/test/data/automountmap_find_pkeys.json index 5a6321aaa..89b4245be 100644 --- a/install/ui/test/data/automountmap_find_pkeys.json +++ b/install/ui/test/data/automountmap_find_pkeys.json @@ -8,25 +8,25 @@ "automountmapname": [ "auto.direct" ], - "dn": "automountmapname=auto.direct,cn=bos,cn=automount,dc=dev,dc=example,dc=com" + "dn": "automountmapname=auto.direct,cn=bos,cn=automount,dc=example,dc=com" }, { "automountmapname": [ "auto.home" ], - "dn": "automountmapname=auto.home,cn=bos,cn=automount,dc=dev,dc=example,dc=com" + "dn": "automountmapname=auto.home,cn=bos,cn=automount,dc=example,dc=com" }, { "automountmapname": [ "auto.log" ], - "dn": "automountmapname=auto.log,cn=bos,cn=automount,dc=dev,dc=example,dc=com" + "dn": "automountmapname=auto.log,cn=bos,cn=automount,dc=example,dc=com" }, { "automountmapname": [ "auto.master" ], - "dn": "automountmapname=auto.master,cn=bos,cn=automount,dc=dev,dc=example,dc=com" + "dn": "automountmapname=auto.master,cn=bos,cn=automount,dc=example,dc=com" } ], "summary": null, diff --git a/install/ui/test/data/automountmap_get_records.json b/install/ui/test/data/automountmap_get_records.json index 0e9079e5c..96730c801 100644 --- a/install/ui/test/data/automountmap_get_records.json +++ b/install/ui/test/data/automountmap_get_records.json @@ -10,7 +10,7 @@ "automountmapname": [ "auto.direct" ], - "dn": "automountmapname=auto.direct,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=auto.direct,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" @@ -25,7 +25,7 @@ "automountmapname": [ "auto.home" ], - "dn": "automountmapname=auto.home,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=auto.home,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" @@ -40,7 +40,7 @@ "automountmapname": [ "auto.log" ], - "dn": "automountmapname=auto.log,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=auto.log,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" @@ -55,7 +55,7 @@ "automountmapname": [ "auto.master" ], - "dn": "automountmapname=auto.master,cn=bos,cn=automount,dc=dev,dc=example,dc=com", + "dn": "automountmapname=auto.master,cn=bos,cn=automount,dc=example,dc=com", "objectclass": [ "automountmap", "top" diff --git a/install/ui/test/data/cert_request.json b/install/ui/test/data/cert_request.json index c4410729a..127183a87 100644 --- a/install/ui/test/data/cert_request.json +++ b/install/ui/test/data/cert_request.json @@ -4,12 +4,12 @@ "result": { "result": { "certificate": "MIICAjCCAWugAwIBAgICBAswDQYJKoZIhvcNAQEFBQAwKTEnMCUGA1UEAxMeSVBBIFRlc3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTEwMTAwNzIzMzk0NFoXDTE1MTAwNzIzMzk0NFowKDEMMAoGA1UECgwDSVBBMRgwFgYDVQQDDA9kZXYuZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOTXyj8grVB7Rj95RFawgdwn9OYZ03LWHZ+HMYggu2/xCCrUrdThP14YBlVqZumjVJSclj6T4ACjjdPJq9JTTmx7gMizDTReus7IPlS6fCxb5v5whQJZsEksXL04OxUMl25euPRFkYcTK1rdW47+AkG10j1qeNW+B6CpdQGR6eM/AgMBAAGjOjA4MBEGCWCGSAGG+EIBAQQEAwIGQDATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcNAQEFBQADgYEASIhq723VL5xP0q51MYXFlGU1boD7pPD1pIQspD/MjCIEupcbH2kAo4wf+EiKsXR0rs+WZkaSgvFqaM4OQ2kWSFTiqmFXFDBEi6EFr68yLg7IpQpNTzVBXERd8B4GwNL9wrRw60jPXlUK29DPBsdGq8fDgX18l39wKkWXv7p1to4=", - "issuer": "CN=Certificate Authority,O=IPA", + "issuer": "CN=Certificate Authority,O=EXAMPLE.COM", "md5_fingerprint": "08:86:a9:f9:87:af:0d:d7:42:01:e0:5f:12:9b:32:7f", "request_id": "1", "serial_number": "1", "sha1_fingerprint": "b8:4c:4b:79:4f:13:03:79:47:08:fa:6b:52:63:3d:f9:15:8e:7e:dc", - "subject": "CN=dev.example.com,O=IPA", + "subject": "CN=dev.example.com,O=EXAMPLE.COM", "valid_not_after": "Tue Oct 13 01:59:32 2015 UTC", "valid_not_before": "Wed Oct 13 01:59:32 2010 UTC" } diff --git a/install/ui/test/data/cert_show.json b/install/ui/test/data/cert_show.json index 71d895f05..3e8a8ab76 100644 --- a/install/ui/test/data/cert_show.json +++ b/install/ui/test/data/cert_show.json @@ -4,11 +4,11 @@ "result": { "result": { "certificate": "MIICAjCCAWugAwIBAgICBAswDQYJKoZIhvcNAQEFBQAwKTEnMCUGA1UEAxMeSVBBIFRlc3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTEwMTAwNzIzMzk0NFoXDTE1MTAwNzIzMzk0NFowKDEMMAoGA1UECgwDSVBBMRgwFgYDVQQDDA9kZXYuZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOTXyj8grVB7Rj95RFawgdwn9OYZ03LWHZ+HMYggu2/xCCrUrdThP14YBlVqZumjVJSclj6T4ACjjdPJq9JTTmx7gMizDTReus7IPlS6fCxb5v5whQJZsEksXL04OxUMl25euPRFkYcTK1rdW47+AkG10j1qeNW+B6CpdQGR6eM/AgMBAAGjOjA4MBEGCWCGSAGG+EIBAQQEAwIGQDATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcNAQEFBQADgYEASIhq723VL5xP0q51MYXFlGU1boD7pPD1pIQspD/MjCIEupcbH2kAo4wf+EiKsXR0rs+WZkaSgvFqaM4OQ2kWSFTiqmFXFDBEi6EFr68yLg7IpQpNTzVBXERd8B4GwNL9wrRw60jPXlUK29DPBsdGq8fDgX18l39wKkWXv7p1to4=", - "issuer": "CN=Certificate Authority,O=IPA", + "issuer": "CN=Certificate Authority,O=EXAMPLE.COM", "md5_fingerprint": "08:86:a9:f9:87:af:0d:d7:42:01:e0:5f:12:9b:32:7f", "serial_number": "1", "sha1_fingerprint": "b8:4c:4b:79:4f:13:03:79:47:08:fa:6b:52:63:3d:f9:15:8e:7e:dc", - "subject": "CN=dev.example.com,O=IPA", + "subject": "CN=dev.example.com,O=EXAMPLE.COM", "valid_not_after": "Tue Oct 13 01:59:32 2015 UTC", "valid_not_before": "Wed Oct 13 01:59:32 2010 UTC" } diff --git a/install/ui/test/data/config_show.json b/install/ui/test/data/config_show.json index dd4485c3e..1b6d59418 100644 --- a/install/ui/test/data/config_show.json +++ b/install/ui/test/data/config_show.json @@ -28,9 +28,9 @@ "cn": [ "ipaConfig" ], - "dn": "cn=ipaconfig,cn=etc,dc=dev,dc=example,dc=com", + "dn": "cn=ipaconfig,cn=etc,dc=example,dc=com", "ipacertificatesubjectbase": [ - "O=DEV.EXAMPLE.COM" + "O=EXAMPLE.COM" ], "ipaconfigstring": [ "AllowNThash" diff --git a/install/ui/test/data/dnsrecord_add.json b/install/ui/test/data/dnsrecord_add.json index 7cbf570da..d34cb3fd0 100644 --- a/install/ui/test/data/dnsrecord_add.json +++ b/install/ui/test/data/dnsrecord_add.json @@ -6,7 +6,7 @@ "arecord": [ "1.2.3.4" ], - "dn": "idnsname=a4,idnsname=dev.example.com,cn=dns,dc=example,dc=com", + "dn": "idnsname=a4,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "a4" ], diff --git a/install/ui/test/data/dnsrecord_find.json b/install/ui/test/data/dnsrecord_find.json index 8ca2283d8..663d630aa 100644 --- a/install/ui/test/data/dnsrecord_find.json +++ b/install/ui/test/data/dnsrecord_find.json @@ -5,7 +5,7 @@ "count": 12, "result": [ { - "dn": "idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "@" ], @@ -14,16 +14,16 @@ ] }, { - "dn": "idnsname=_kerberos,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos" ], "txtrecord": [ - "DEV.EXAMPLE.COM" + "EXAMPLE.COM" ] }, { - "dn": "idnsname=_kerberos-master._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos-master._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos-master._tcp" ], @@ -32,7 +32,7 @@ ] }, { - "dn": "idnsname=_kerberos-master._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos-master._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos-master._udp" ], @@ -41,7 +41,7 @@ ] }, { - "dn": "idnsname=_kerberos._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos._tcp" ], @@ -50,7 +50,7 @@ ] }, { - "dn": "idnsname=_kerberos._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos._udp" ], @@ -59,7 +59,7 @@ ] }, { - "dn": "idnsname=_kpasswd._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kpasswd._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kpasswd._tcp" ], @@ -68,7 +68,7 @@ ] }, { - "dn": "idnsname=_kpasswd._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kpasswd._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kpasswd._udp" ], @@ -77,7 +77,7 @@ ] }, { - "dn": "idnsname=_ldap._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_ldap._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_ldap._tcp" ], @@ -86,7 +86,7 @@ ] }, { - "dn": "idnsname=_ntp._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_ntp._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_ntp._udp" ], @@ -98,7 +98,7 @@ "aaaarecord": [ "fec0::5054:ff:feb5:5a47" ], - "dn": "idnsname=dev,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=dev,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "dev" ] @@ -114,7 +114,7 @@ "1.3.5.7", "10.10.2.1" ], - "dn": "idnsname=testrec,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=testrec,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "testrec" ], diff --git a/install/ui/test/data/dnsrecord_find_pkeys.json b/install/ui/test/data/dnsrecord_find_pkeys.json index aec4c9093..777f3bfb7 100644 --- a/install/ui/test/data/dnsrecord_find_pkeys.json +++ b/install/ui/test/data/dnsrecord_find_pkeys.json @@ -5,73 +5,73 @@ "count": 12, "result": [ { - "dn": "idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "@" ] }, { - "dn": "idnsname=_kerberos,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos" ] }, { - "dn": "idnsname=_kerberos-master._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos-master._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos-master._tcp" ] }, { - "dn": "idnsname=_kerberos-master._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos-master._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos-master._udp" ] }, { - "dn": "idnsname=_kerberos._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos._tcp" ] }, { - "dn": "idnsname=_kerberos._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos._udp" ] }, { - "dn": "idnsname=_kpasswd._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kpasswd._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kpasswd._tcp" ] }, { - "dn": "idnsname=_kpasswd._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kpasswd._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kpasswd._udp" ] }, { - "dn": "idnsname=_ldap._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_ldap._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_ldap._tcp" ] }, { - "dn": "idnsname=_ntp._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_ntp._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_ntp._udp" ] }, { - "dn": "idnsname=dev,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=dev,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "dev" ] }, { - "dn": "idnsname=testrec,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=testrec,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "testrec" ] diff --git a/install/ui/test/data/dnsrecord_get_records.json b/install/ui/test/data/dnsrecord_get_records.json index d2dd03e01..0415c1f71 100644 --- a/install/ui/test/data/dnsrecord_get_records.json +++ b/install/ui/test/data/dnsrecord_get_records.json @@ -7,7 +7,7 @@ { "error": null, "result": { - "dn": "idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "@" ], @@ -21,12 +21,12 @@ { "error": null, "result": { - "dn": "idnsname=_kerberos,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos" ], "txtrecord": [ - "DEV.EXAMPLE.COM" + "EXAMPLE.COM" ] }, "summary": null, @@ -35,7 +35,7 @@ { "error": null, "result": { - "dn": "idnsname=_kerberos-master._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos-master._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos-master._tcp" ], @@ -49,7 +49,7 @@ { "error": null, "result": { - "dn": "idnsname=_kerberos-master._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos-master._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos-master._udp" ], @@ -63,7 +63,7 @@ { "error": null, "result": { - "dn": "idnsname=_kerberos._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos._tcp" ], @@ -77,7 +77,7 @@ { "error": null, "result": { - "dn": "idnsname=_kerberos._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kerberos._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kerberos._udp" ], @@ -91,7 +91,7 @@ { "error": null, "result": { - "dn": "idnsname=_kpasswd._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kpasswd._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kpasswd._tcp" ], @@ -105,7 +105,7 @@ { "error": null, "result": { - "dn": "idnsname=_kpasswd._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_kpasswd._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_kpasswd._udp" ], @@ -119,7 +119,7 @@ { "error": null, "result": { - "dn": "idnsname=_ldap._tcp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_ldap._tcp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_ldap._tcp" ], @@ -133,7 +133,7 @@ { "error": null, "result": { - "dn": "idnsname=_ntp._udp,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=_ntp._udp,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "_ntp._udp" ], @@ -150,7 +150,7 @@ "aaaarecord": [ "fec0::5054:ff:feb5:5a47" ], - "dn": "idnsname=dev,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=dev,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "dev" ] @@ -171,7 +171,7 @@ "1.3.5.7", "10.10.2.1" ], - "dn": "idnsname=testrec,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=testrec,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "testrec" ], diff --git a/install/ui/test/data/dnsrecord_show.json b/install/ui/test/data/dnsrecord_show.json index d15ef5398..3e3d5f8b4 100644 --- a/install/ui/test/data/dnsrecord_show.json +++ b/install/ui/test/data/dnsrecord_show.json @@ -48,7 +48,7 @@ "sshfprecord": "rscwo", "txtrecord": "rscwo" }, - "dn": "idnsname=testrec,idnsname=example.com,cn=dns,dc=dev,dc=example,dc=com", + "dn": "idnsname=testrec,idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ "testrec" ], diff --git a/install/ui/test/data/dnszone_add.json b/install/ui/test/data/dnszone_add.json index 3cb833056..a47e7e614 100644 --- a/install/ui/test/data/dnszone_add.json +++ b/install/ui/test/data/dnszone_add.json @@ -3,12 +3,12 @@ "id": 3, "result": { "result": { - "dn": "idnsname=dev.example.com,cn=dns,dc=example,dc=com", + "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", "idnsallowdynupdate": [ "FALSE" ], "idnsname": [ - "dev.example.com" + "example.com" ], "idnssoaexpire": [ "1209600" @@ -26,7 +26,7 @@ "900" ], "idnssoarname": [ - "root.dev.example.com." + "root.example.com." ], "idnssoaserial": [ "2010021201" @@ -41,6 +41,6 @@ ] }, "summary": null, - "value": "dev.example.com" + "value": "example.com" } }
\ No newline at end of file diff --git a/install/ui/test/data/dnszone_find.json b/install/ui/test/data/dnszone_find.json index fdf2c8e40..7477d6167 100644 --- a/install/ui/test/data/dnszone_find.json +++ b/install/ui/test/data/dnszone_find.json @@ -2,15 +2,15 @@ "error": null, "id": 6, "result": { - "count": 3, + "count": 2, "result": [ { - "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", + "dn": "idnsname=1.168.192.in-addr.arpa,cn=dns,dc=example,dc=com", "idnsallowdynupdate": [ "TRUE" ], "idnsname": [ - "example.com" + "1.168.192.in-addr.arpa" ], "idnssoaexpire": [ "1209600" @@ -19,7 +19,7 @@ "3600" ], "idnssoamname": [ - "ipa.example.com." + "dev.example.com." ], "idnssoarefresh": [ "3600" @@ -28,19 +28,19 @@ "900" ], "idnssoarname": [ - "root.ipa.example.com." + "root.1.168.192.in-addr.arpa." ], "idnssoaserial": [ "2010021201" ], "idnsupdatepolicy": [ - "grant EXAMPLE.COM krb5-self * A;" + "grant EXAMPLE.COM krb5-subdomain 1.168.192.in-addr.arpa. PTR;" ], "idnszoneactive": [ "TRUE" ], "nsrecord": [ - "ipa.example.com." + "dev.example.com." ], "objectclass": [ "top", @@ -49,12 +49,12 @@ ] }, { - "dn": "idnsname=122.168.192.in-addr.arpa,cn=dns,dc=example,dc=com", + "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", "idnsallowdynupdate": [ "TRUE" ], "idnsname": [ - "122.168.192.in-addr.arpa" + "example.com" ], "idnssoaexpire": [ "1209600" @@ -63,7 +63,7 @@ "3600" ], "idnssoamname": [ - "ipa.example.com." + "dev.example.com." ], "idnssoarefresh": [ "3600" @@ -72,57 +72,19 @@ "900" ], "idnssoarname": [ - "root.122.168.192.in-addr.arpa." + "root.dev.example.com." ], "idnssoaserial": [ "2010021201" ], "idnsupdatepolicy": [ - "grant EXAMPLE.COM krb5-subdomain 122.168.192.in-addr.arpa. PTR;" + "grant EXAMPLE.COM krb5-self * A;" ], "idnszoneactive": [ "TRUE" ], "nsrecord": [ - "ipa.example.com." - ], - "objectclass": [ - "top", - "idnsrecord", - "idnszone" - ] - }, - { - "dn": "idnsname=dev.example.com,cn=dns,dc=example,dc=com", - "idnsallowdynupdate": [ - "FALSE" - ], - "idnsname": [ - "dev.example.com" - ], - "idnssoaexpire": [ - "1209600" - ], - "idnssoaminimum": [ - "3600" - ], - "idnssoamname": [ - "example.com" - ], - "idnssoarefresh": [ - "3600" - ], - "idnssoaretry": [ - "900" - ], - "idnssoarname": [ - "root.dev.example.com." - ], - "idnssoaserial": [ - "2010021201" - ], - "idnszoneactive": [ - "TRUE" + "dev.example.com." ], "objectclass": [ "top", diff --git a/install/ui/test/data/dnszone_find_pkeys.json b/install/ui/test/data/dnszone_find_pkeys.json index 1b4f02500..f40636f43 100644 --- a/install/ui/test/data/dnszone_find_pkeys.json +++ b/install/ui/test/data/dnszone_find_pkeys.json @@ -2,24 +2,18 @@ "error": null, "id": 6, "result": { - "count": 3, + "count": 2, "result": [ { - "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", - "idnsname": [ - "example.com" - ] - }, - { - "dn": "idnsname=122.168.192.in-addr.arpa,cn=dns,dc=example,dc=com", + "dn": "idnsname=1.168.192.in-addr.arpa,cn=dns,dc=example,dc=com", "idnsname": [ - "122.168.192.in-addr.arpa" + "1.168.192.in-addr.arpa" ] }, { - "dn": "idnsname=dev.example.com,cn=dns,dc=example,dc=com", + "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", "idnsname": [ - "dev.example.com" + "example.com" ] } ], diff --git a/install/ui/test/data/dnszone_get_records.json b/install/ui/test/data/dnszone_get_records.json index 07b70734d..2e14716ce 100644 --- a/install/ui/test/data/dnszone_get_records.json +++ b/install/ui/test/data/dnszone_get_records.json @@ -2,17 +2,17 @@ "error": null, "id": 6, "result": { - "count": 3, + "count": 2, "results": [ { "error": null, "result": { - "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", + "dn": "idnsname=1.168.192.in-addr.arpa,cn=dns,dc=example,dc=com", "idnsallowdynupdate": [ "TRUE" ], "idnsname": [ - "example.com" + "1.168.192.in-addr.arpa" ], "idnssoaexpire": [ "1209600" @@ -21,7 +21,7 @@ "3600" ], "idnssoamname": [ - "ipa.example.com." + "dev.example.com." ], "idnssoarefresh": [ "3600" @@ -30,19 +30,19 @@ "900" ], "idnssoarname": [ - "root.ipa.example.com." + "root.1.168.192.in-addr.arpa." ], "idnssoaserial": [ "2010021201" ], "idnsupdatepolicy": [ - "grant EXAMPLE.COM krb5-self * A;" + "grant EXAMPLE.COM krb5-subdomain 1.168.192.in-addr.arpa. PTR;" ], "idnszoneactive": [ "TRUE" ], "nsrecord": [ - "ipa.example.com." + "dev.example.com." ], "objectclass": [ "top", @@ -51,17 +51,17 @@ ] }, "summary": null, - "value": "example.com" + "value": "1.168.192.in-addr.arpa" }, { "error": null, "result": { - "dn": "idnsname=122.168.192.in-addr.arpa,cn=dns,dc=example,dc=com", + "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", "idnsallowdynupdate": [ "TRUE" ], "idnsname": [ - "122.168.192.in-addr.arpa" + "example.com" ], "idnssoaexpire": [ "1209600" @@ -70,7 +70,7 @@ "3600" ], "idnssoamname": [ - "ipa.example.com." + "dev.example.com." ], "idnssoarefresh": [ "3600" @@ -79,62 +79,19 @@ "900" ], "idnssoarname": [ - "root.122.168.192.in-addr.arpa." + "root.dev.example.com." ], "idnssoaserial": [ "2010021201" ], "idnsupdatepolicy": [ - "grant EXAMPLE.COM krb5-subdomain 122.168.192.in-addr.arpa. PTR;" + "grant EXAMPLE.COM krb5-self * A;" ], "idnszoneactive": [ "TRUE" ], "nsrecord": [ - "ipa.example.com." - ], - "objectclass": [ - "top", - "idnsrecord", - "idnszone" - ] - }, - "summary": null, - "value": "122.168.192.in-addr.arpa" - }, - { - "error": null, - "result": { - "dn": "idnsname=dev.example.com,cn=dns,dc=example,dc=com", - "idnsallowdynupdate": [ - "FALSE" - ], - "idnsname": [ - "dev.example.com" - ], - "idnssoaexpire": [ - "1209600" - ], - "idnssoaminimum": [ - "3600" - ], - "idnssoamname": [ - "example.com" - ], - "idnssoarefresh": [ - "3600" - ], - "idnssoaretry": [ - "900" - ], - "idnssoarname": [ - "root.dev.example.com." - ], - "idnssoaserial": [ - "2010021201" - ], - "idnszoneactive": [ - "TRUE" + "dev.example.com." ], "objectclass": [ "top", @@ -143,7 +100,7 @@ ] }, "summary": null, - "value": "dev.example.com" + "value": "example.com" } ] } diff --git a/install/ui/test/data/dnszone_show.json b/install/ui/test/data/dnszone_show.json index afad93c45..b7d5b87b2 100644 --- a/install/ui/test/data/dnszone_show.json +++ b/install/ui/test/data/dnszone_show.json @@ -47,12 +47,12 @@ "sshfprecord": "rscwo", "txtrecord": "rscwo" }, - "dn": "idnsname=dev.example.com,cn=dns,dc=example,dc=com", + "dn": "idnsname=example.com,cn=dns,dc=example,dc=com", "idnsallowdynupdate": [ "FALSE" ], "idnsname": [ - "dev.example.com" + "example.com" ], "idnssoaexpire": [ "1209600" @@ -70,7 +70,7 @@ "900" ], "idnssoarname": [ - "root.dev.example.com." + "root.example.com." ], "idnssoaserial": [ "2010021201" @@ -85,6 +85,6 @@ ] }, "summary": null, - "value": "dev.example.com" + "value": "example.com" } }
\ No newline at end of file diff --git a/install/ui/test/data/group_find.json b/install/ui/test/data/group_find.json index fe40e254a..6df265044 100644 --- a/install/ui/test/data/group_find.json +++ b/install/ui/test/data/group_find.json @@ -11,7 +11,7 @@ "description": [ "Account administrators group" ], - "dn": "cn=admins,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=admins,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800000" ], @@ -26,7 +26,7 @@ "description": [ "Default group for all users" ], - "dn": "cn=ipausers,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=ipausers,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800001" ], @@ -46,7 +46,7 @@ "description": [ "Limited admins who can edit other users" ], - "dn": "cn=editors,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=editors,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800002" ] @@ -58,7 +58,7 @@ "description": [ "Monsters on Sesame Street" ], - "dn": "cn=monsters,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=monsters,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800009" ] @@ -70,7 +70,7 @@ "description": [ "Muppets moonlighting for CTW" ], - "dn": "cn=muppets,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=muppets,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800010" ] diff --git a/install/ui/test/data/group_find_pkeys.json b/install/ui/test/data/group_find_pkeys.json index 483751bfe..90acc1282 100644 --- a/install/ui/test/data/group_find_pkeys.json +++ b/install/ui/test/data/group_find_pkeys.json @@ -8,31 +8,31 @@ "cn": [ "admins" ], - "dn": "cn=admins,cn=groups,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=admins,cn=groups,cn=accounts,dc=example,dc=com" }, { "cn": [ "ipausers" ], - "dn": "cn=ipausers,cn=groups,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=ipausers,cn=groups,cn=accounts,dc=example,dc=com" }, { "cn": [ "editors" ], - "dn": "cn=editors,cn=groups,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=editors,cn=groups,cn=accounts,dc=example,dc=com" }, { "cn": [ "monsters" ], - "dn": "cn=monsters,cn=groups,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=monsters,cn=groups,cn=accounts,dc=example,dc=com" }, { "cn": [ "muppets" ], - "dn": "cn=muppets,cn=groups,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=muppets,cn=groups,cn=accounts,dc=example,dc=com" } ], "summary": "5 groups matched", diff --git a/install/ui/test/data/group_get_records.json b/install/ui/test/data/group_get_records.json index d40b4f2a3..dd4ca26f8 100644 --- a/install/ui/test/data/group_get_records.json +++ b/install/ui/test/data/group_get_records.json @@ -13,7 +13,7 @@ "description": [ "Account administrators group" ], - "dn": "cn=admins,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=admins,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800000" ], @@ -33,7 +33,7 @@ "description": [ "Default group for all users" ], - "dn": "cn=ipausers,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=ipausers,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800001" ], @@ -58,7 +58,7 @@ "description": [ "Limited admins who can edit other users" ], - "dn": "cn=editors,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=editors,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800002" ] @@ -75,7 +75,7 @@ "description": [ "Monsters on Sesame Street" ], - "dn": "cn=monsters,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=monsters,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800009" ] @@ -92,7 +92,7 @@ "description": [ "Muppets moonlighting for CTW" ], - "dn": "cn=muppets,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=muppets,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1420800010" ] diff --git a/install/ui/test/data/hbacrule_add.json b/install/ui/test/data/hbacrule_add.json index 2a5d251bf..47c32869c 100644 --- a/install/ui/test/data/hbacrule_add.json +++ b/install/ui/test/data/hbacrule_add.json @@ -9,7 +9,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=f3e69e82-e3b411df-bfde9b13-2b28c216,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=f3e69e82-e3b411df-bfde9b13-2b28c216,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacrule_add_host.json b/install/ui/test/data/hbacrule_add_host.json index 038d6aea4..2de87eaf3 100644 --- a/install/ui/test/data/hbacrule_add_host.json +++ b/install/ui/test/data/hbacrule_add_host.json @@ -20,7 +20,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacrule_add_service.json b/install/ui/test/data/hbacrule_add_service.json index c658fe8b5..e6ad13933 100644 --- a/install/ui/test/data/hbacrule_add_service.json +++ b/install/ui/test/data/hbacrule_add_service.json @@ -20,7 +20,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacrule_add_sourcehost.json b/install/ui/test/data/hbacrule_add_sourcehost.json index a657207f5..1c165b39a 100644 --- a/install/ui/test/data/hbacrule_add_sourcehost.json +++ b/install/ui/test/data/hbacrule_add_sourcehost.json @@ -20,7 +20,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacrule_add_user.json b/install/ui/test/data/hbacrule_add_user.json index 0c4c976e4..35b30a115 100644 --- a/install/ui/test/data/hbacrule_add_user.json +++ b/install/ui/test/data/hbacrule_add_user.json @@ -20,7 +20,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacrule_find.json b/install/ui/test/data/hbacrule_find.json index 0629e3827..e3e15b9d7 100644 --- a/install/ui/test/data/hbacrule_find.json +++ b/install/ui/test/data/hbacrule_find.json @@ -14,7 +14,7 @@ "description": [ "Allow all users to access any host from any host" ], - "dn": "ipauniqueid=ca842a42-a445-11e0-87ff-525400b55a47,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=ca842a42-a445-11e0-87ff-525400b55a47,cn=hbac,dc=example,dc=com", "hostcategory": [ "all" ], diff --git a/install/ui/test/data/hbacrule_remove_host.json b/install/ui/test/data/hbacrule_remove_host.json index 02f56ecd6..e1f10f35b 100644 --- a/install/ui/test/data/hbacrule_remove_host.json +++ b/install/ui/test/data/hbacrule_remove_host.json @@ -20,7 +20,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacrule_remove_service.json b/install/ui/test/data/hbacrule_remove_service.json index f8b6b51a5..86a7ff165 100644 --- a/install/ui/test/data/hbacrule_remove_service.json +++ b/install/ui/test/data/hbacrule_remove_service.json @@ -20,7 +20,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacrule_remove_sourcehost.json b/install/ui/test/data/hbacrule_remove_sourcehost.json index da32f76e0..9b62f42e4 100644 --- a/install/ui/test/data/hbacrule_remove_sourcehost.json +++ b/install/ui/test/data/hbacrule_remove_sourcehost.json @@ -20,7 +20,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacrule_remove_user.json b/install/ui/test/data/hbacrule_remove_user.json index f25317e83..721158a83 100644 --- a/install/ui/test/data/hbacrule_remove_user.json +++ b/install/ui/test/data/hbacrule_remove_user.json @@ -20,7 +20,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=e8aca082-e64a11df-9864f2e0-e0578392,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacrule_show.json b/install/ui/test/data/hbacrule_show.json index df4dcd783..394a043c8 100644 --- a/install/ui/test/data/hbacrule_show.json +++ b/install/ui/test/data/hbacrule_show.json @@ -32,7 +32,7 @@ "cn": [ "rule1" ], - "dn": "ipauniqueid=4ed8b682-edf511df-b3f78f4b-11cc007b,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=4ed8b682-edf511df-b3f78f4b-11cc007b,cn=hbac,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], diff --git a/install/ui/test/data/hbacsvc_add.json b/install/ui/test/data/hbacsvc_add.json index 87eb51d78..b0b3cbdfe 100644 --- a/install/ui/test/data/hbacsvc_add.json +++ b/install/ui/test/data/hbacsvc_add.json @@ -9,7 +9,7 @@ "description": [ "Test Service" ], - "dn": "cn=test,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "cn=test,cn=hbacservices,cn=hbac,dc=example,dc=com", "ipauniqueid": [ "c3302e82-ecfd11df-b3f78f4b-11cc007b" ], diff --git a/install/ui/test/data/hbacsvc_find.json b/install/ui/test/data/hbacsvc_find.json index 86a9bcaa5..41055be40 100644 --- a/install/ui/test/data/hbacsvc_find.json +++ b/install/ui/test/data/hbacsvc_find.json @@ -11,7 +11,7 @@ "description": [ "sshd" ], - "dn": "cn=sshd,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sshd,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ @@ -20,7 +20,7 @@ "description": [ "ftp" ], - "dn": "cn=ftp,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=ftp,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ @@ -29,7 +29,7 @@ "description": [ "su" ], - "dn": "cn=su,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=su,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ @@ -38,7 +38,7 @@ "description": [ "login" ], - "dn": "cn=login,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=login,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ @@ -47,7 +47,7 @@ "description": [ "su with login shell" ], - "dn": "cn=su-l,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=su-l,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ @@ -56,7 +56,7 @@ "description": [ "sudo" ], - "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ @@ -65,7 +65,7 @@ "description": [ "sudo-i" ], - "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ @@ -74,7 +74,7 @@ "description": [ "gdm" ], - "dn": "cn=gdm,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=gdm,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ @@ -83,7 +83,7 @@ "description": [ "gdm-password" ], - "dn": "cn=gdm-password,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=gdm-password,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ @@ -92,7 +92,7 @@ "description": [ "kdm" ], - "dn": "cn=kdm,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=kdm,cn=hbacservices,cn=hbac,dc=example,dc=com" } ], "summary": null, diff --git a/install/ui/test/data/hbacsvc_find_pkeys.json b/install/ui/test/data/hbacsvc_find_pkeys.json index 01939d2ce..f06a7b08c 100644 --- a/install/ui/test/data/hbacsvc_find_pkeys.json +++ b/install/ui/test/data/hbacsvc_find_pkeys.json @@ -8,61 +8,61 @@ "cn": [ "sshd" ], - "dn": "cn=sshd,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sshd,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ "ftp" ], - "dn": "cn=ftp,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=ftp,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ "su" ], - "dn": "cn=su,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=su,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ "login" ], - "dn": "cn=login,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=login,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ "su-l" ], - "dn": "cn=su-l,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=su-l,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ "sudo" ], - "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ "sudo-i" ], - "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ "gdm" ], - "dn": "cn=gdm,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=gdm,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ "gdm-password" ], - "dn": "cn=gdm-password,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=gdm-password,cn=hbacservices,cn=hbac,dc=example,dc=com" }, { "cn": [ "kdm" ], - "dn": "cn=kdm,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=kdm,cn=hbacservices,cn=hbac,dc=example,dc=com" } ], "summary": null, diff --git a/install/ui/test/data/hbacsvc_get_records.json b/install/ui/test/data/hbacsvc_get_records.json index fd8af3056..8ffb5d877 100644 --- a/install/ui/test/data/hbacsvc_get_records.json +++ b/install/ui/test/data/hbacsvc_get_records.json @@ -13,7 +13,7 @@ "description": [ "sshd" ], - "dn": "cn=sshd,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sshd,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "sshd" @@ -27,7 +27,7 @@ "description": [ "ftp" ], - "dn": "cn=ftp,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=ftp,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "ftp" @@ -41,7 +41,7 @@ "description": [ "su" ], - "dn": "cn=su,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=su,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "su" @@ -55,7 +55,7 @@ "description": [ "login" ], - "dn": "cn=login,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=login,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "login" @@ -69,7 +69,7 @@ "description": [ "su with login shell" ], - "dn": "cn=su-l,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=su-l,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "su-l" @@ -83,7 +83,7 @@ "description": [ "sudo" ], - "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "sudo" @@ -97,7 +97,7 @@ "description": [ "sudo-i" ], - "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "sudo-i" @@ -111,7 +111,7 @@ "description": [ "gdm" ], - "dn": "cn=gdm,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=gdm,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "gdm" @@ -125,7 +125,7 @@ "description": [ "gdm-password" ], - "dn": "cn=gdm-password,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=gdm-password,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "gdm-password" @@ -139,7 +139,7 @@ "description": [ "kdm" ], - "dn": "cn=kdm,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=kdm,cn=hbacservices,cn=hbac,dc=example,dc=com" }, "summary": null, "value": "kdm" diff --git a/install/ui/test/data/hbacsvc_show.json b/install/ui/test/data/hbacsvc_show.json index 749d5da95..92e68f324 100644 --- a/install/ui/test/data/hbacsvc_show.json +++ b/install/ui/test/data/hbacsvc_show.json @@ -17,12 +17,12 @@ "description": [ "sudo" ], - "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=example,dc=com", "ipauniqueid": [ "676e92a1-ec7611df-b3f78f4b-11cc007b" ], "memberof": [ - "cn=Sudo,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com" + "cn=Sudo,cn=hbacservicegroups,cn=hbac,dc=example,dc=com" ], "objectclass": [ "ipahbacservice", diff --git a/install/ui/test/data/hbacsvcgroup_add.json b/install/ui/test/data/hbacsvcgroup_add.json index 0dd1e96fe..0a6bd5e2f 100644 --- a/install/ui/test/data/hbacsvcgroup_add.json +++ b/install/ui/test/data/hbacsvcgroup_add.json @@ -9,7 +9,7 @@ "description": [ "Test Service Group" ], - "dn": "cn=test,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "cn=test,cn=hbacservicegroups,cn=hbac,dc=example,dc=com", "ipauniqueid": [ "0ab6ba82-ecfe11df-b3f78f4b-11cc007b" ], diff --git a/install/ui/test/data/hbacsvcgroup_add_member.json b/install/ui/test/data/hbacsvcgroup_add_member.json index 8526e1848..82059f5a1 100644 --- a/install/ui/test/data/hbacsvcgroup_add_member.json +++ b/install/ui/test/data/hbacsvcgroup_add_member.json @@ -15,7 +15,7 @@ "description": [ "Test Service Group" ], - "dn": "cn=test,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "cn=test,cn=hbacservicegroups,cn=hbac,dc=example,dc=com", "member_hbacsvc": [ "test" ] diff --git a/install/ui/test/data/hbacsvcgroup_find.json b/install/ui/test/data/hbacsvcgroup_find.json index 503bfa379..38dcf630b 100644 --- a/install/ui/test/data/hbacsvcgroup_find.json +++ b/install/ui/test/data/hbacsvcgroup_find.json @@ -11,7 +11,7 @@ "description": [ "Default group of Sudo related services" ], - "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=example,dc=com", "member_hbacsvc": [ "sudo", "sudo-i" diff --git a/install/ui/test/data/hbacsvcgroup_find_pkeys.json b/install/ui/test/data/hbacsvcgroup_find_pkeys.json index fdca25658..44b3630fe 100644 --- a/install/ui/test/data/hbacsvcgroup_find_pkeys.json +++ b/install/ui/test/data/hbacsvcgroup_find_pkeys.json @@ -8,7 +8,7 @@ "cn": [ "Sudo" ], - "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=example,dc=com" } ], "summary": "1 group matched", diff --git a/install/ui/test/data/hbacsvcgroup_get_records.json b/install/ui/test/data/hbacsvcgroup_get_records.json index 1d9a62f83..64844c1dd 100644 --- a/install/ui/test/data/hbacsvcgroup_get_records.json +++ b/install/ui/test/data/hbacsvcgroup_get_records.json @@ -13,7 +13,7 @@ "description": [ "Default group of Sudo related services" ], - "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=example,dc=com", "member_hbacsvc": [ "sudo", "sudo-i" diff --git a/install/ui/test/data/hbacsvcgroup_member_hbacsvc.json b/install/ui/test/data/hbacsvcgroup_member_hbacsvc.json index b2332f5a9..81ce98b33 100644 --- a/install/ui/test/data/hbacsvcgroup_member_hbacsvc.json +++ b/install/ui/test/data/hbacsvcgroup_member_hbacsvc.json @@ -13,12 +13,12 @@ "description": [ "sudo" ], - "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=example,dc=com", "ipauniqueid": [ "42927a86-f46d-11df-8cc1-00163e72f2d9" ], "memberof": [ - "cn=Sudo,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com" + "cn=Sudo,cn=hbacservicegroups,cn=hbac,dc=example,dc=com" ], "objectclass": [ "ipahbacservice", @@ -37,12 +37,12 @@ "description": [ "sudo-i" ], - "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=example,dc=com", "ipauniqueid": [ "42970a6a-f46d-11df-8cc1-00163e72f2d9" ], "memberof": [ - "cn=Sudo,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com" + "cn=Sudo,cn=hbacservicegroups,cn=hbac,dc=example,dc=com" ], "objectclass": [ "ipahbacservice", diff --git a/install/ui/test/data/hbacsvcgroup_remove_member.json b/install/ui/test/data/hbacsvcgroup_remove_member.json index cdf413789..fe017c6d6 100644 --- a/install/ui/test/data/hbacsvcgroup_remove_member.json +++ b/install/ui/test/data/hbacsvcgroup_remove_member.json @@ -15,7 +15,7 @@ "description": [ "Test Service Group" ], - "dn": "cn=test,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "cn=test,cn=hbacservicegroups,cn=hbac,dc=example,dc=com" } } } diff --git a/install/ui/test/data/hbacsvcgroup_show.json b/install/ui/test/data/hbacsvcgroup_show.json index 05ba55ba5..b9464df2d 100644 --- a/install/ui/test/data/hbacsvcgroup_show.json +++ b/install/ui/test/data/hbacsvcgroup_show.json @@ -24,7 +24,7 @@ "description": [ "Default group of Sudo related services" ], - "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=example,dc=com", "ipauniqueid": [ "676e92ab-ec7611df-b3f78f4b-11cc007b" ], diff --git a/install/ui/test/data/host_mod.json b/install/ui/test/data/host_mod.json index 2e34257e8..7a0b36c25 100644 --- a/install/ui/test/data/host_mod.json +++ b/install/ui/test/data/host_mod.json @@ -52,10 +52,10 @@ "ac28dca0-f3b5-11df-879f-00163e72f2d9" ], "krbprincipalname": [ - "host/test.example.com@DEV.EXAMPLE.COM" + "host/test.example.com@EXAMPLE.COM" ], "managedby": [ - "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + "fqdn=test.example.com,cn=computers,cn=accounts,dc=example,dc=com" ], "objectclass": [ "ipaobject", diff --git a/install/ui/test/data/host_show.json b/install/ui/test/data/host_show.json index b87802310..6edb060a2 100644 --- a/install/ui/test/data/host_show.json +++ b/install/ui/test/data/host_show.json @@ -46,7 +46,7 @@ "cn": [ "test.example.com" ], - "dn": "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "fqdn=test.example.com,cn=computers,cn=accounts,dc=example,dc=com", "fqdn": [ "test.example.com" ], @@ -55,10 +55,10 @@ "ac28dca0-f3b5-11df-879f-00163e72f2d9" ], "krbprincipalname": [ - "host/test.example.com@DEV.EXAMPLE.COM" + "host/test.example.com@EXAMPLE.COM" ], "managedby": [ - "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + "fqdn=test.example.com,cn=computers,cn=accounts,dc=example,dc=com" ], "objectclass": [ "ipaobject", diff --git a/install/ui/test/data/host_show_dev.example.com.json b/install/ui/test/data/host_show_dev.example.com.json index 1ee9f445f..5547160b7 100644 --- a/install/ui/test/data/host_show_dev.example.com.json +++ b/install/ui/test/data/host_show_dev.example.com.json @@ -46,7 +46,7 @@ "cn": [ "dev.example.com" ], - "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=example,dc=com", "fqdn": [ "dev.example.com" ], @@ -69,13 +69,13 @@ "19700101000000Z" ], "krbprincipalname": [ - "host/dev.example.com@DEV.EXAMPLE.COM" + "host/dev.example.com@EXAMPLE.COM" ], "krbticketflags": [ "0" ], "managedby": [ - "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + "fqdn=dev.example.com,cn=computers,cn=accounts,dc=example,dc=com" ], "objectclass": [ "top", diff --git a/install/ui/test/data/host_show_test.example.com.json b/install/ui/test/data/host_show_test.example.com.json index b87802310..6edb060a2 100644 --- a/install/ui/test/data/host_show_test.example.com.json +++ b/install/ui/test/data/host_show_test.example.com.json @@ -46,7 +46,7 @@ "cn": [ "test.example.com" ], - "dn": "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "fqdn=test.example.com,cn=computers,cn=accounts,dc=example,dc=com", "fqdn": [ "test.example.com" ], @@ -55,10 +55,10 @@ "ac28dca0-f3b5-11df-879f-00163e72f2d9" ], "krbprincipalname": [ - "host/test.example.com@DEV.EXAMPLE.COM" + "host/test.example.com@EXAMPLE.COM" ], "managedby": [ - "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + "fqdn=test.example.com,cn=computers,cn=accounts,dc=example,dc=com" ], "objectclass": [ "ipaobject", diff --git a/install/ui/test/data/hostgroup_member_host.json b/install/ui/test/data/hostgroup_member_host.json index c4c7dfa98..e91ddf5ee 100644 --- a/install/ui/test/data/hostgroup_member_host.json +++ b/install/ui/test/data/hostgroup_member_host.json @@ -13,7 +13,7 @@ "description": [ "Development" ], - "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=example,dc=com", "fqdn": [ "dev.example.com" ], @@ -36,7 +36,7 @@ "19700101000000Z" ], "krbprincipalname": [ - "host/dev.example.com@DEV.EXAMPLE.COM" + "host/dev.example.com@EXAMPLE.COM" ], "krbticketflags": [ "0" diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 5e9d2eb0f..99b461aac 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -128,7 +128,6 @@ "certificate_hold": "Certificate Hold", "cessation_of_operation": "Cessation of Operation", "common_name": "Common Name", - "enter_csr": "Enter the Base64-encoded CSR below", "expires_on": "Expires On", "fingerprints": "Fingerprints", "issue_certificate": "Issue New Certificate for ${entity} ${primary_key}", @@ -145,6 +144,7 @@ "privilege_withdrawn": "Privilege Withdrawn", "reason": "Reason for Revocation", "remove_from_crl": "Remove from CRL", + "request_message": "<ol><li>Create a private key in a secure location, for example:<br/># openssl genrsa -out key.pem</li><li>Create a CSR with subject CN=${hostname},O=${realm}, for example:<br/># openssl req -new -key key.pem -out cert.csr \\<br/> -subj '/O=${realm}/CN=${hostname}'</li><li>Copy and paste the CSR below:</li></ol>", "restore_certificate": "Restore Certificate for ${entity} ${primary_key}", "restore_confirmation": "To confirm your intention to restore this certificate, click the \"Restore\" button.", "revoke_certificate": "Revoke Certificate for ${entity} ${primary_key}", diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json index 0ed111d18..18d453a4f 100644 --- a/install/ui/test/data/ipa_init_objects.json +++ b/install/ui/test/data/ipa_init_objects.json @@ -4542,7 +4542,7 @@ "aciattrs": [], "attribute_members": {}, "bindable": false, - "container_dn": "cn=DEV.EXAMPLE.COM,cn=kerberos", + "container_dn": "cn=EXAMPLE.COM,cn=kerberos", "default_attributes": [ "krbmaxticketlife", "krbmaxrenewableage" @@ -5418,7 +5418,7 @@ ], "attribute_members": {}, "bindable": false, - "container_dn": "cn=DEV.EXAMPLE.COM,cn=kerberos", + "container_dn": "cn=EXAMPLE.COM,cn=kerberos", "default_attributes": [ "cn", "cospriority", diff --git a/install/ui/test/data/krbtpolicy_show.json b/install/ui/test/data/krbtpolicy_show.json index 9a30ca3ba..547d2e224 100644 --- a/install/ui/test/data/krbtpolicy_show.json +++ b/install/ui/test/data/krbtpolicy_show.json @@ -27,9 +27,9 @@ "objectclass": "rscwo" }, "cn": [ - "DEV.EXAMPLE.COM" + "EXAMPLE.COM" ], - "dn": "cn=dev.example.com,cn=kerberos,dc=dev,dc=example,dc=com", + "dn": "cn=EXAMPLE.COM,cn=kerberos,dc=example,dc=com", "krbdefaultencsalttypes": [ "aes256-cts:special", "aes128-cts:special", @@ -46,7 +46,7 @@ "2" ], "krbsubtrees": [ - "dc=dev,dc=example,dc=com" + "dc=example,dc=com" ], "krbsupportedencsalttypes": [ "aes256-cts:normal", diff --git a/install/ui/test/data/permission_find.json b/install/ui/test/data/permission_find.json index 9308a809c..16ab3eeb5 100644 --- a/install/ui/test/data/permission_find.json +++ b/install/ui/test/data/permission_find.json @@ -11,7 +11,7 @@ "description": [ "Filter Permission" ], - "dn": "cn=filter,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=filter,cn=permissions,cn=pbac,dc=example,dc=com", "filter": "(ou=Engineering)", "objectclass": [ "groupofnames", @@ -28,7 +28,7 @@ "description": [ "Subtree Permission" ], - "dn": "cn=subtree,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=subtree,cn=permissions,cn=pbac,dc=example,dc=com", "objectclass": [ "groupofnames", "top" @@ -36,7 +36,7 @@ "permissions": [ "write" ], - "subtree": "ldap:///dc=ipa" + "subtree": "ldap:///dc=example,dc=com" }, { "cn": [ @@ -45,7 +45,7 @@ "description": [ "Target Group Permission" ], - "dn": "cn=targetgroup,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=targetgroup,cn=permissions,cn=pbac,dc=example,dc=com", "objectclass": [ "groupofnames", "top" @@ -66,7 +66,7 @@ "description": [ "Type Permission" ], - "dn": "cn=type,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=type,cn=permissions,cn=pbac,dc=example,dc=com", "objectclass": [ "groupofnames", "top" diff --git a/install/ui/test/data/permission_find_pkeys.json b/install/ui/test/data/permission_find_pkeys.json index 35d0acb98..d60200549 100644 --- a/install/ui/test/data/permission_find_pkeys.json +++ b/install/ui/test/data/permission_find_pkeys.json @@ -8,25 +8,25 @@ "cn": [ "filter" ], - "dn": "cn=filter,cn=permissions,cn=pbac,dc=ipa" + "dn": "cn=filter,cn=permissions,cn=pbac,dc=example,dc=com" }, { "cn": [ "subtree" ], - "dn": "cn=subtree,cn=permissions,cn=pbac,dc=ipa" + "dn": "cn=subtree,cn=permissions,cn=pbac,dc=example,dc=com" }, { "cn": [ "targetgroup" ], - "dn": "cn=targetgroup,cn=permissions,cn=pbac,dc=ipa" + "dn": "cn=targetgroup,cn=permissions,cn=pbac,dc=example,dc=com" }, { "cn": [ "type" ], - "dn": "cn=type,cn=permissions,cn=pbac,dc=ipa" + "dn": "cn=type,cn=permissions,cn=pbac,dc=example,dc=com" } ], "summary": "4 permissions matched", diff --git a/install/ui/test/data/permission_get_records.json b/install/ui/test/data/permission_get_records.json index c337d72cc..7b6d22377 100644 --- a/install/ui/test/data/permission_get_records.json +++ b/install/ui/test/data/permission_get_records.json @@ -13,7 +13,7 @@ "description": [ "Filter Permission" ], - "dn": "cn=filter,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=filter,cn=permissions,cn=pbac,dc=example,dc=com", "filter": "(ou=Engineering)", "objectclass": [ "groupofnames", @@ -35,7 +35,7 @@ "description": [ "Subtree Permission" ], - "dn": "cn=subtree,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=subtree,cn=permissions,cn=pbac,dc=example,dc=com", "objectclass": [ "groupofnames", "top" @@ -43,7 +43,7 @@ "permissions": [ "write" ], - "subtree": "ldap:///dc=ipa" + "subtree": "ldap:///dc=example,dc=com" }, "summary": null, "value": "subtree" @@ -57,7 +57,7 @@ "description": [ "Target Group Permission" ], - "dn": "cn=targetgroup,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=targetgroup,cn=permissions,cn=pbac,dc=example,dc=com", "objectclass": [ "groupofnames", "top" @@ -83,7 +83,7 @@ "description": [ "Type Permission" ], - "dn": "cn=type,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=type,cn=permissions,cn=pbac,dc=example,dc=com", "objectclass": [ "groupofnames", "top" diff --git a/install/ui/test/data/permission_show_filter.json b/install/ui/test/data/permission_show_filter.json index c32bfb7b8..ee4ed2f7c 100644 --- a/install/ui/test/data/permission_show_filter.json +++ b/install/ui/test/data/permission_show_filter.json @@ -26,7 +26,7 @@ "description": [ "Filter Permission" ], - "dn": "cn=filter,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=filter,cn=permissions,cn=pbac,dc=example,dc=com", "filter": "(ou=Engineering)", "objectclass": [ "groupofnames", diff --git a/install/ui/test/data/permission_show_subtree.json b/install/ui/test/data/permission_show_subtree.json index af39e45b2..f362436d4 100644 --- a/install/ui/test/data/permission_show_subtree.json +++ b/install/ui/test/data/permission_show_subtree.json @@ -26,7 +26,7 @@ "description": [ "Subtree Permission" ], - "dn": "cn=subtree,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=subtree,cn=permissions,cn=pbac,dc=example,dc=com", "objectclass": [ "groupofnames", "top" @@ -34,7 +34,7 @@ "permissions": [ "write" ], - "subtree": "ldap:///dc=ipa" + "subtree": "ldap:///dc=example,dc=com" }, "summary": null, "value": "subtree" diff --git a/install/ui/test/data/permission_show_targetgroup.json b/install/ui/test/data/permission_show_targetgroup.json index cfe49b938..564df8412 100644 --- a/install/ui/test/data/permission_show_targetgroup.json +++ b/install/ui/test/data/permission_show_targetgroup.json @@ -30,7 +30,7 @@ "description": [ "Target Group Permission" ], - "dn": "cn=group,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=group,cn=permissions,cn=pbac,dc=example,dc=com", "objectclass": [ "groupofnames", "top" diff --git a/install/ui/test/data/permission_show_type.json b/install/ui/test/data/permission_show_type.json index 4ddbcfa68..573345b4e 100644 --- a/install/ui/test/data/permission_show_type.json +++ b/install/ui/test/data/permission_show_type.json @@ -31,7 +31,7 @@ "description": [ "Type Permission" ], - "dn": "cn=type,cn=permissions,cn=pbac,dc=ipa", + "dn": "cn=type,cn=permissions,cn=pbac,dc=example,dc=com", "objectclass": [ "groupofnames", "top" diff --git a/install/ui/test/data/privilege_find.json b/install/ui/test/data/privilege_find.json index c9054d887..c4d4d1ab4 100644 --- a/install/ui/test/data/privilege_find.json +++ b/install/ui/test/data/privilege_find.json @@ -205,7 +205,7 @@ ], "dn": "cn=dnsserver,cn=privileges,cn=accounts,dc=example,dc=com", "memberindirect": [ - "krbprincipalname=dns/ipa.example.com@example.com,cn=services,cn=accounts,dc=example,dc=com" + "krbprincipalname=dns/dev.example.com@example.com,cn=services,cn=accounts,dc=example,dc=com" ] } ], diff --git a/install/ui/test/data/privilege_get_records.json b/install/ui/test/data/privilege_get_records.json index 38efdbcd4..e821d1b99 100644 --- a/install/ui/test/data/privilege_get_records.json +++ b/install/ui/test/data/privilege_get_records.json @@ -272,7 +272,7 @@ ], "dn": "cn=dnsserver,cn=privileges,cn=accounts,dc=example,dc=com", "memberindirect": [ - "krbprincipalname=dns/ipa.example.com@example.com,cn=services,cn=accounts,dc=example,dc=com" + "krbprincipalname=dns/dev.example.com@example.com,cn=services,cn=accounts,dc=example,dc=com" ] }, "summary": null, diff --git a/install/ui/test/data/privilege_show.json b/install/ui/test/data/privilege_show.json index ce2a25978..adc8bfbe1 100644 --- a/install/ui/test/data/privilege_show.json +++ b/install/ui/test/data/privilege_show.json @@ -25,7 +25,7 @@ ], "dn": "cn=dnsserver,cn=privileges,cn=accounts,dc=example,dc=com", "memberindirect": [ - "krbprincipalname=dns/ipa.example.com@example.com,cn=services,cn=accounts,dc=example,dc=com" + "krbprincipalname=dns/dev.example.com@example.com,cn=services,cn=accounts,dc=example,dc=com" ], "objectclass": [ "top", diff --git a/install/ui/test/data/pwpolicy_find.json b/install/ui/test/data/pwpolicy_find.json index 94cf88df6..c025a1ea8 100644 --- a/install/ui/test/data/pwpolicy_find.json +++ b/install/ui/test/data/pwpolicy_find.json @@ -5,8 +5,8 @@ "count": 3, "result": [ { - "cn": "GLOBAL", - "dn": "cn=accounts,dc=example,dc=com", + "cn": "global_policy", + "dn": "cn=global_policy,cn=example.com,cn=kerberos,dc=example,dc=com", "krbmaxpwdlife": [ "90" ], @@ -25,12 +25,12 @@ }, { "cn": [ - "testgroup12" + "ipausers" ], "cospriority": [ "1" ], - "dn": "cn=testgroup12,cn=example.com,cn=kerberos,dc=example,dc=com", + "dn": "cn=ipausers,cn=example.com,cn=kerberos,dc=example,dc=com", "krbmaxpwdlife": [ "40" ], @@ -46,12 +46,12 @@ }, { "cn": [ - "testgroup22" + "editors" ], "cospriority": [ "2" ], - "dn": "cn=testgroup22,cn=example.com,cn=kerberos,dc=example,dc=com", + "dn": "cn=editors,cn=example.com,cn=kerberos,dc=example,dc=com", "krbmaxpwdlife": [ "60" ], diff --git a/install/ui/test/data/pwpolicy_find_pkeys.json b/install/ui/test/data/pwpolicy_find_pkeys.json index a5a0cf5ec..7c22476b5 100644 --- a/install/ui/test/data/pwpolicy_find_pkeys.json +++ b/install/ui/test/data/pwpolicy_find_pkeys.json @@ -5,20 +5,20 @@ "count": 3, "result": [ { - "cn": "GLOBAL", - "dn": "cn=accounts,dc=example,dc=com" + "cn": "global_policy", + "dn": "cn=global_policy,cn=example.com,cn=kerberos,dc=example,dc=com" }, { "cn": [ - "testgroup12" + "ipausers" ], - "dn": "cn=testgroup12,cn=example.com,cn=kerberos,dc=example,dc=com" + "dn": "cn=ipausers,cn=example.com,cn=kerberos,dc=example,dc=com" }, { "cn": [ - "testgroup22" + "editors" ], - "dn": "cn=testgroup22,cn=example.com,cn=kerberos,dc=example,dc=com" + "dn": "cn=editors,cn=example.com,cn=kerberos,dc=example,dc=com" } ], "summary": null, diff --git a/install/ui/test/data/pwpolicy_get_records.json b/install/ui/test/data/pwpolicy_get_records.json index 77fff6a45..24a265147 100644 --- a/install/ui/test/data/pwpolicy_get_records.json +++ b/install/ui/test/data/pwpolicy_get_records.json @@ -7,8 +7,8 @@ { "error": null, "result": { - "cn": "GLOBAL", - "dn": "cn=accounts,dc=example,dc=com", + "cn": "global_policy", + "dn": "cn=global_policy,cn=example.com,cn=kerberos,dc=example,dc=com", "krbmaxpwdlife": [ "90" ], @@ -32,12 +32,12 @@ "error": null, "result": { "cn": [ - "testgroup12" + "ipausers" ], "cospriority": [ "1" ], - "dn": "cn=testgroup12,cn=example.com,cn=kerberos,dc=example,dc=com", + "dn": "cn=ipausers,cn=example.com,cn=kerberos,dc=example,dc=com", "krbmaxpwdlife": [ "40" ], @@ -52,18 +52,18 @@ ] }, "summary": null, - "value": "testgroup12" + "value": "ipausers" }, { "error": null, "result": { "cn": [ - "testgroup22" + "editors" ], "cospriority": [ "2" ], - "dn": "cn=testgroup22,cn=example.com,cn=kerberos,dc=example,dc=com", + "dn": "cn=editors,cn=example.com,cn=kerberos,dc=example,dc=com", "krbmaxpwdlife": [ "60" ], @@ -78,7 +78,7 @@ ] }, "summary": null, - "value": "testgroup22" + "value": "editors" } ] } diff --git a/install/ui/test/data/pwpolicy_show.json b/install/ui/test/data/pwpolicy_show.json index 5329f6b34..e5529254d 100644 --- a/install/ui/test/data/pwpolicy_show.json +++ b/install/ui/test/data/pwpolicy_show.json @@ -20,7 +20,7 @@ "cn": [ "global_policy" ], - "dn": "cn=global_policy,cn=dev.example.com,cn=kerberos,dc=dev,dc=example,dc=com", + "dn": "cn=global_policy,cn=example.com,cn=kerberos,dc=example,dc=com", "krbmaxpwdlife": [ "90" ], diff --git a/install/ui/test/data/service_add.json b/install/ui/test/data/service_add.json index 4275d9bba..57dad3609 100644 --- a/install/ui/test/data/service_add.json +++ b/install/ui/test/data/service_add.json @@ -3,12 +3,12 @@ "id": 0, "result": { "result": { - "dn": "krbprincipalname=test/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=test/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "ipauniqueid": [ "5b314ad9-bae4-11df-b82f-00163e72f2d9" ], "krbprincipalname": [ - "test/dev.example.com@DEV.EXAMPLE.COM" + "test/dev.example.com@EXAMPLE.COM" ], "managedby_host": [ "dev.example.com" @@ -23,7 +23,7 @@ "top" ] }, - "summary": "Added service \"test/dev.example.com@DEV.EXAMPLE.COM\"", - "value": "test/dev.example.com@DEV.EXAMPLE.COM" + "summary": "Added service \"test/dev.example.com@EXAMPLE.COM\"", + "value": "test/dev.example.com@EXAMPLE.COM" } } diff --git a/install/ui/test/data/service_add_host.json b/install/ui/test/data/service_add_host.json index cb199e310..0ba7e0179 100644 --- a/install/ui/test/data/service_add_host.json +++ b/install/ui/test/data/service_add_host.json @@ -9,9 +9,9 @@ } }, "result": { - "dn": "krbprincipalname=test/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=test/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "krbprincipalname": [ - "test/dev.example.com@DEV.EXAMPLE.COM" + "test/dev.example.com@EXAMPLE.COM" ], "managedby_host": [ "dev.example.com" diff --git a/install/ui/test/data/service_del.json b/install/ui/test/data/service_del.json index 053b0ad99..403ee3708 100644 --- a/install/ui/test/data/service_del.json +++ b/install/ui/test/data/service_del.json @@ -3,7 +3,7 @@ "id": 0, "result": { "result": true, - "summary": "Deleted service \"test/dev.example.com@DEV.EXAMPLE.COM\"", - "value": "test/dev.example.com@DEV.EXAMPLE.COM" + "summary": "Deleted service \"test/dev.example.com@EXAMPLE.COM\"", + "value": "test/dev.example.com@EXAMPLE.COM" } } diff --git a/install/ui/test/data/service_disable.json b/install/ui/test/data/service_disable.json index d62c05472..aa06e9339 100644 --- a/install/ui/test/data/service_disable.json +++ b/install/ui/test/data/service_disable.json @@ -3,7 +3,7 @@ "id": 0, "result": { "result": true, - "summary": "Removed kerberos key from \"test/dev.example.com@DEV.EXAMPLE.COM\"", - "value": "test/dev.example.com@DEV.EXAMPLE.COM" + "summary": "Removed kerberos key from \"test/dev.example.com@EXAMPLE.COM\"", + "value": "test/dev.example.com@EXAMPLE.COM" } } diff --git a/install/ui/test/data/service_find.json b/install/ui/test/data/service_find.json index b71ea9e31..aa46921ac 100644 --- a/install/ui/test/data/service_find.json +++ b/install/ui/test/data/service_find.json @@ -5,10 +5,10 @@ "count": 3, "result": [ { - "dn": "krbprincipalname=ldap/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=ldap/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "has_keytab": true, "krbprincipalname": [ - "ldap/dev.example.com@DEV.EXAMPLE.COM" + "ldap/dev.example.com@EXAMPLE.COM" ], "managedby_host": [ "dev.example.com" @@ -20,10 +20,10 @@ ] }, { - "dn": "krbprincipalname=http/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=http/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "has_keytab": true, "krbprincipalname": [ - "HTTP/dev.example.com@DEV.EXAMPLE.COM" + "HTTP/dev.example.com@EXAMPLE.COM" ], "usercertificate": [ { @@ -32,10 +32,10 @@ ] }, { - "dn": "krbprincipalname=test/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=test/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "has_keytab": false, "krbprincipalname": [ - "test/dev.example.com@DEV.EXAMPLE.COM" + "test/dev.example.com@EXAMPLE.COM" ], "managedby_host": [ "dev.example.com" diff --git a/install/ui/test/data/service_find_pkeys.json b/install/ui/test/data/service_find_pkeys.json index ef14125f2..0605572d4 100644 --- a/install/ui/test/data/service_find_pkeys.json +++ b/install/ui/test/data/service_find_pkeys.json @@ -5,21 +5,21 @@ "count": 3, "result": [ { - "dn": "krbprincipalname=ldap/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=ldap/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "krbprincipalname": [ - "ldap/dev.example.com@DEV.EXAMPLE.COM" + "ldap/dev.example.com@EXAMPLE.COM" ] }, { - "dn": "krbprincipalname=http/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=http/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "krbprincipalname": [ - "HTTP/dev.example.com@DEV.EXAMPLE.COM" + "HTTP/dev.example.com@EXAMPLE.COM" ] }, { - "dn": "krbprincipalname=test/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=test/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "krbprincipalname": [ - "test/dev.example.com@DEV.EXAMPLE.COM" + "test/dev.example.com@EXAMPLE.COM" ] } ], diff --git a/install/ui/test/data/service_get_records.json b/install/ui/test/data/service_get_records.json index a91d1db49..519e1f579 100644 --- a/install/ui/test/data/service_get_records.json +++ b/install/ui/test/data/service_get_records.json @@ -7,10 +7,10 @@ { "error": null, "result": { - "dn": "krbprincipalname=ldap/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=ldap/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "has_keytab": true, "krbprincipalname": [ - "ldap/dev.example.com@DEV.EXAMPLE.COM" + "ldap/dev.example.com@EXAMPLE.COM" ], "managedby_host": [ "dev.example.com" @@ -22,15 +22,15 @@ ] }, "summary": null, - "value": "ldap/dev.example.com@DEV.EXAMPLE.COM" + "value": "ldap/dev.example.com@EXAMPLE.COM" }, { "error": null, "result": { - "dn": "krbprincipalname=http/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=http/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "has_keytab": true, "krbprincipalname": [ - "HTTP/dev.example.com@DEV.EXAMPLE.COM" + "HTTP/dev.example.com@EXAMPLE.COM" ], "usercertificate": [ { @@ -39,22 +39,22 @@ ] }, "summary": null, - "value": "HTTP/dev.example.com@DEV.EXAMPLE.COM" + "value": "HTTP/dev.example.com@EXAMPLE.COM" }, { "error": null, "result": { - "dn": "krbprincipalname=test/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=test/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "has_keytab": false, "krbprincipalname": [ - "test/dev.example.com@DEV.EXAMPLE.COM" + "test/dev.example.com@EXAMPLE.COM" ], "managedby_host": [ "dev.example.com" ] }, "summary": null, - "value": "test/dev.example.com@DEV.EXAMPLE.COM" + "value": "test/dev.example.com@EXAMPLE.COM" } ] } diff --git a/install/ui/test/data/service_managedby_host.json b/install/ui/test/data/service_managedby_host.json index 181fc5b96..fea02e4a1 100644 --- a/install/ui/test/data/service_managedby_host.json +++ b/install/ui/test/data/service_managedby_host.json @@ -53,7 +53,7 @@ "description": [ "Development" ], - "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=example,dc=com", "fqdn": [ "dev.example.com" ], @@ -76,7 +76,7 @@ "19700101000000Z" ], "krbprincipalname": [ - "host/dev.example.com@DEV.EXAMPLE.COM" + "host/dev.example.com@EXAMPLE.COM" ], "krbticketflags": [ "0" diff --git a/install/ui/test/data/service_mod.json b/install/ui/test/data/service_mod.json index f56186466..a9f4a66d2 100644 --- a/install/ui/test/data/service_mod.json +++ b/install/ui/test/data/service_mod.json @@ -4,7 +4,7 @@ "result": { "result": { "krbprincipalname": [ - "test/dev.example.com@DEV.EXAMPLE.COM" + "test/dev.example.com@EXAMPLE.COM" ], "managedby_host": [ "dev.example.com" @@ -15,7 +15,7 @@ } ] }, - "summary": "Modified service \"test/dev.example.com@DEV.EXAMPLE.COM\"", - "value": "test/dev.example.com@DEV.EXAMPLE.COM" + "summary": "Modified service \"test/dev.example.com@EXAMPLE.COM\"", + "value": "test/dev.example.com@EXAMPLE.COM" } }
\ No newline at end of file diff --git a/install/ui/test/data/service_remove_host.sh b/install/ui/test/data/service_remove_host.sh index 15234f4d0..8e5e2dcf4 100644 --- a/install/ui/test/data/service_remove_host.sh +++ b/install/ui/test/data/service_remove_host.sh @@ -9,9 +9,9 @@ } }, "result": { - "dn": "krbprincipalname=test/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=test/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "krbprincipalname": [ - "test/dev.example.com@DEV.EXAMPLE.COM" + "test/dev.example.com@EXAMPLE.COM" ] } } diff --git a/install/ui/test/data/service_show.json b/install/ui/test/data/service_show.json index 9cb11d535..0595828be 100644 --- a/install/ui/test/data/service_show.json +++ b/install/ui/test/data/service_show.json @@ -32,9 +32,9 @@ "objectclass": "rscwo", "usercertificate": "rscwo" }, - "dn": "krbprincipalname=test/dev.example.com@dev.example.com,cn=services,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "krbprincipalname=test/dev.example.com@EXAMPLE.COM,cn=services,cn=accounts,dc=example,dc=com", "has_keytab": true, - "issuer": "CN=IPA Test Certificate Authority", + "issuer": "CN=Certificate Authority,O=EXAMPLE.COM", "ipauniqueid": [ "c0298f70-f396-11df-a2aa-00163e72f2d9" ], @@ -42,7 +42,7 @@ "20101119101837Z" ], "krbprincipalname": [ - "test/dev.example.com@DEV.EXAMPLE.COM" + "test/dev.example.com@EXAMPLE.COM" ], "managedby_host": [ "dev.example.com" @@ -50,7 +50,7 @@ "md5_fingerprint": "08:86:a9:f9:87:af:0d:d7:42:01:e0:5f:12:9b:32:7f", "serial_number": "1", "sha1_fingerprint": "b8:4c:4b:79:4f:13:03:79:47:08:fa:6b:52:63:3d:f9:15:8e:7e:dc", - "subject": "CN=dev.example.com,O=IPA", + "subject": "CN=dev.example.com,O=EXAMPLE.COM", "usercertificate": [ { "__base64__": "MIICAjCCAWugAwIBAgICBAswDQYJKoZIhvcNAQEFBQAwKTEnMCUGA1UEAxMeSVBBIFRlc3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTEwMTAwNzIzMzk0NFoXDTE1MTAwNzIzMzk0NFowKDEMMAoGA1UECgwDSVBBMRgwFgYDVQQDDA9kZXYuZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOTXyj8grVB7Rj95RFawgdwn9OYZ03LWHZ+HMYggu2/xCCrUrdThP14YBlVqZumjVJSclj6T4ACjjdPJq9JTTmx7gMizDTReus7IPlS6fCxb5v5whQJZsEksXL04OxUMl25euPRFkYcTK1rdW47+AkG10j1qeNW+B6CpdQGR6eM/AgMBAAGjOjA4MBEGCWCGSAGG+EIBAQQEAwIGQDATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcNAQEFBQADgYEASIhq723VL5xP0q51MYXFlGU1boD7pPD1pIQspD/MjCIEupcbH2kAo4wf+EiKsXR0rs+WZkaSgvFqaM4OQ2kWSFTiqmFXFDBEi6EFr68yLg7IpQpNTzVBXERd8B4GwNL9wrRw60jPXlUK29DPBsdGq8fDgX18l39wKkWXv7p1to4=" @@ -69,6 +69,6 @@ ] }, "summary": null, - "value": "test/dev.example.com@DEV.EXAMPLE.COM" + "value": "test/dev.example.com@EXAMPLE.COM" } } diff --git a/install/ui/test/data/sudocmd_add.json b/install/ui/test/data/sudocmd_add.json index 6fb4a5fc1..e98913bb4 100644 --- a/install/ui/test/data/sudocmd_add.json +++ b/install/ui/test/data/sudocmd_add.json @@ -3,7 +3,7 @@ "id": 0, "result": { "result": { - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=example,dc=com", "ipauniqueid": [ "09e4ab26-f456-11df-bb95-00163e72f2d9" ], diff --git a/install/ui/test/data/sudocmd_find.json b/install/ui/test/data/sudocmd_find.json index f7f5a23ef..b4514c21f 100644 --- a/install/ui/test/data/sudocmd_find.json +++ b/install/ui/test/data/sudocmd_find.json @@ -5,13 +5,13 @@ "count": 2, "result": [ { - "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=example,dc=com", "sudocmd": [ "/usr/bin/more" ] }, { - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=example,dc=com", "sudocmd": [ "/usr/bin/less" ] diff --git a/install/ui/test/data/sudocmd_find_pkeys.json b/install/ui/test/data/sudocmd_find_pkeys.json index f7f5a23ef..b4514c21f 100644 --- a/install/ui/test/data/sudocmd_find_pkeys.json +++ b/install/ui/test/data/sudocmd_find_pkeys.json @@ -5,13 +5,13 @@ "count": 2, "result": [ { - "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=example,dc=com", "sudocmd": [ "/usr/bin/more" ] }, { - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=example,dc=com", "sudocmd": [ "/usr/bin/less" ] diff --git a/install/ui/test/data/sudocmd_get_records.json b/install/ui/test/data/sudocmd_get_records.json index 0ae943c80..cdb899a1c 100644 --- a/install/ui/test/data/sudocmd_get_records.json +++ b/install/ui/test/data/sudocmd_get_records.json @@ -7,7 +7,7 @@ { "error": null, "result": { - "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=example,dc=com", "sudocmd": [ "/usr/bin/more" ] @@ -18,7 +18,7 @@ { "error": null, "result": { - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=example,dc=com", "sudocmd": [ "/usr/bin/less" ] diff --git a/install/ui/test/data/sudocmd_memberof_add.json b/install/ui/test/data/sudocmd_memberof_add.json index fc45ef4e2..54cbe65b6 100644 --- a/install/ui/test/data/sudocmd_memberof_add.json +++ b/install/ui/test/data/sudocmd_memberof_add.json @@ -20,7 +20,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=ipa", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "member_sudocmd": [ "/usr/bin/less" ] @@ -42,7 +42,7 @@ "description": [ "Group 2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=ipa", + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "member_sudocmd": [ "/usr/bin/more" ] diff --git a/install/ui/test/data/sudocmd_memberof_remove.json b/install/ui/test/data/sudocmd_memberof_remove.json index c5e031b86..e28c1f4e9 100644 --- a/install/ui/test/data/sudocmd_memberof_remove.json +++ b/install/ui/test/data/sudocmd_memberof_remove.json @@ -20,7 +20,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=ipa" + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com" } }, { @@ -39,7 +39,7 @@ "description": [ "Group 2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=ipa", + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "memberindirect_sudocmd": [ "/usr/bin/more" ] diff --git a/install/ui/test/data/sudocmd_memberof_show.json b/install/ui/test/data/sudocmd_memberof_show.json index 279dc6c96..a9bc4af67 100644 --- a/install/ui/test/data/sudocmd_memberof_show.json +++ b/install/ui/test/data/sudocmd_memberof_show.json @@ -13,7 +13,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=ipa", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "ipauniqueid": [ "fc775d2e-1d56-11e0-b7cd-00163e2fe6de" ], @@ -39,7 +39,7 @@ "description": [ "Group 2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=ipa", + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "ipauniqueid": [ "b90c1930-1d5b-11e0-ac89-00163e2fe6de" ], diff --git a/install/ui/test/data/sudocmd_show.json b/install/ui/test/data/sudocmd_show.json index b27c832f3..1cf40806b 100644 --- a/install/ui/test/data/sudocmd_show.json +++ b/install/ui/test/data/sudocmd_show.json @@ -11,13 +11,13 @@ "nsaccountlock": "rscwo", "sudocmd": "rscwo" }, - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=example,dc=com", "ipauniqueid": [ "06708d0e-f454-11df-9273-00163e72f2d9" ], "memberof": [ - "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", - "cn=group2,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" + "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", + "cn=group2,cn=sudocmdgroups,cn=sudo,dc=example,dc=com" ], "objectclass": [ "ipaobject", diff --git a/install/ui/test/data/sudocmdgroup_add.json b/install/ui/test/data/sudocmdgroup_add.json index ce389f564..8f4cc10e1 100644 --- a/install/ui/test/data/sudocmdgroup_add.json +++ b/install/ui/test/data/sudocmdgroup_add.json @@ -9,7 +9,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "ipauniqueid": [ "1a8f4852-f459-11df-815c-00163e72f2d9" ], diff --git a/install/ui/test/data/sudocmdgroup_add_member.json b/install/ui/test/data/sudocmdgroup_add_member.json index f64c73a17..b91b51daa 100644 --- a/install/ui/test/data/sudocmdgroup_add_member.json +++ b/install/ui/test/data/sudocmdgroup_add_member.json @@ -16,7 +16,7 @@ "description": [ "Sudo Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "member_sudocmd": [ "/usr/bin/more", "/usr/bin/less" diff --git a/install/ui/test/data/sudocmdgroup_find.json b/install/ui/test/data/sudocmdgroup_find.json index d640e35bd..dbeeba905 100644 --- a/install/ui/test/data/sudocmdgroup_find.json +++ b/install/ui/test/data/sudocmdgroup_find.json @@ -11,7 +11,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "member_sudocmd": [ "/usr/bin/more", "/usr/bin/less" @@ -24,7 +24,7 @@ "description": [ "Group 2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=example,dc=com" } ], "summary": "2 sudo command groups matched", diff --git a/install/ui/test/data/sudocmdgroup_find_pkeys.json b/install/ui/test/data/sudocmdgroup_find_pkeys.json index 03a3cf4d4..8a5aa2036 100644 --- a/install/ui/test/data/sudocmdgroup_find_pkeys.json +++ b/install/ui/test/data/sudocmdgroup_find_pkeys.json @@ -8,13 +8,13 @@ "cn": [ "group1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com" }, { "cn": [ "group2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=example,dc=com" } ], "summary": "2 sudo command groups matched", diff --git a/install/ui/test/data/sudocmdgroup_get_records.json b/install/ui/test/data/sudocmdgroup_get_records.json index 2670bea1c..9c48c9c9d 100644 --- a/install/ui/test/data/sudocmdgroup_get_records.json +++ b/install/ui/test/data/sudocmdgroup_get_records.json @@ -13,7 +13,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "member_sudocmd": [ "/usr/bin/more", "/usr/bin/less" @@ -31,7 +31,7 @@ "description": [ "Group 2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=example,dc=com" }, "summary": null, "value": "group2" diff --git a/install/ui/test/data/sudocmdgroup_member_sudocmd.json b/install/ui/test/data/sudocmdgroup_member_sudocmd.json index 7871a4684..3d5f1570f 100644 --- a/install/ui/test/data/sudocmdgroup_member_sudocmd.json +++ b/install/ui/test/data/sudocmdgroup_member_sudocmd.json @@ -10,12 +10,12 @@ "description": [ "more" ], - "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=example,dc=com", "ipauniqueid": [ "a9138c9a-fc0c-11df-8584-00163e72f2d9" ], "memberof": [ - "cn=test,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" + "cn=test,cn=sudocmdgroups,cn=sudo,dc=example,dc=com" ], "objectclass": [ "ipaobject", @@ -34,12 +34,12 @@ "description": [ "less" ], - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=example,dc=com", "ipauniqueid": [ "44ce29ee-fc38-11df-b995-00163e72f2d9" ], "memberof": [ - "cn=test,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" + "cn=test,cn=sudocmdgroups,cn=sudo,dc=example,dc=com" ], "objectclass": [ "ipaobject", diff --git a/install/ui/test/data/sudocmdgroup_remove_member.json b/install/ui/test/data/sudocmdgroup_remove_member.json index c0ff05a20..8a685a76c 100644 --- a/install/ui/test/data/sudocmdgroup_remove_member.json +++ b/install/ui/test/data/sudocmdgroup_remove_member.json @@ -16,7 +16,7 @@ "description": [ "Sudo Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com" } } } diff --git a/install/ui/test/data/sudocmdgroup_show.json b/install/ui/test/data/sudocmdgroup_show.json index 1478ba265..0f67d8130 100644 --- a/install/ui/test/data/sudocmdgroup_show.json +++ b/install/ui/test/data/sudocmdgroup_show.json @@ -23,7 +23,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=example,dc=com", "ipauniqueid": [ "d99989a6-f459-11df-9273-00163e72f2d9" ], diff --git a/install/ui/test/data/sudorule_add.json b/install/ui/test/data/sudorule_add.json index 396b4935c..d48f2c4c8 100644 --- a/install/ui/test/data/sudorule_add.json +++ b/install/ui/test/data/sudorule_add.json @@ -9,7 +9,7 @@ "description": [ "test" ], - "dn": "ipauniqueid=94ef3550-f443-11df-a2aa-00163e72f2d9,cn=sudorules,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=94ef3550-f443-11df-a2aa-00163e72f2d9,cn=sudorules,cn=sudo,dc=example,dc=com", "ipauniqueid": [ "94ef3550-f443-11df-a2aa-00163e72f2d9" ], diff --git a/install/ui/test/data/sudorule_find.json b/install/ui/test/data/sudorule_find.json index a843b2a5b..a72894db3 100644 --- a/install/ui/test/data/sudorule_find.json +++ b/install/ui/test/data/sudorule_find.json @@ -8,7 +8,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=dev,dc=example,dc=com" + "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=example,dc=com" } ], "summary": null, diff --git a/install/ui/test/data/sudorule_find_pkeys.json b/install/ui/test/data/sudorule_find_pkeys.json index a843b2a5b..a72894db3 100644 --- a/install/ui/test/data/sudorule_find_pkeys.json +++ b/install/ui/test/data/sudorule_find_pkeys.json @@ -8,7 +8,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=dev,dc=example,dc=com" + "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=example,dc=com" } ], "summary": null, diff --git a/install/ui/test/data/sudorule_get_records.json b/install/ui/test/data/sudorule_get_records.json index 1c740edd5..7e1d09cc5 100644 --- a/install/ui/test/data/sudorule_get_records.json +++ b/install/ui/test/data/sudorule_get_records.json @@ -35,7 +35,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=example,dc=com", "externalhost": [ "external.example.com" ], diff --git a/install/ui/test/data/sudorule_show.json b/install/ui/test/data/sudorule_show.json index afb3f3b64..ccb6b2bb2 100644 --- a/install/ui/test/data/sudorule_show.json +++ b/install/ui/test/data/sudorule_show.json @@ -31,7 +31,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=example,dc=com", "externalhost": [ "external.example.com" ], diff --git a/install/ui/test/data/user_find.json b/install/ui/test/data/user_find.json index 825baa2ca..036797dce 100644 --- a/install/ui/test/data/user_find.json +++ b/install/ui/test/data/user_find.json @@ -5,7 +5,7 @@ "count": 100, "result": [ { - "dn": "uid=abradley,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=abradley,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400048" ], @@ -32,7 +32,7 @@ ] }, { - "dn": "uid=abrown,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=abrown,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400013" ], @@ -59,7 +59,7 @@ ] }, { - "dn": "uid=acarlson,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=acarlson,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400060" ], @@ -86,7 +86,7 @@ ] }, { - "dn": "uid=adaniels,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=adaniels,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400059" ], @@ -113,7 +113,7 @@ ] }, { - "dn": "uid=admin,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=admin,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400000" ], @@ -137,7 +137,7 @@ ] }, { - "dn": "uid=agordon,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=agordon,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400080" ], @@ -164,7 +164,7 @@ ] }, { - "dn": "uid=ajohnson,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ajohnson,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400011" ], @@ -191,7 +191,7 @@ ] }, { - "dn": "uid=ajones,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ajones,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400014" ], @@ -218,7 +218,7 @@ ] }, { - "dn": "uid=amiller,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=amiller,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400015" ], @@ -245,7 +245,7 @@ ] }, { - "dn": "uid=apeterson,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=apeterson,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400104" ], @@ -272,7 +272,7 @@ ] }, { - "dn": "uid=arhodes,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=arhodes,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400031" ], @@ -299,7 +299,7 @@ ] }, { - "dn": "uid=aromero,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=aromero,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400079" ], @@ -326,7 +326,7 @@ ] }, { - "dn": "uid=asmith,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=asmith,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400010" ], @@ -353,7 +353,7 @@ ] }, { - "dn": "uid=awilliams,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=awilliams,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400012" ], @@ -380,7 +380,7 @@ ] }, { - "dn": "uid=bbauer,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=bbauer,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400094" ], @@ -407,7 +407,7 @@ ] }, { - "dn": "uid=bgross,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=bgross,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400071" ], @@ -434,7 +434,7 @@ ] }, { - "dn": "uid=bmcgee,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=bmcgee,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400075" ], @@ -461,7 +461,7 @@ ] }, { - "dn": "uid=cduffy,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=cduffy,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400058" ], @@ -488,7 +488,7 @@ ] }, { - "dn": "uid=chartman,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=chartman,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400082" ], @@ -515,7 +515,7 @@ ] }, { - "dn": "uid=chuynh,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=chuynh,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400093" ], @@ -542,7 +542,7 @@ ] }, { - "dn": "uid=ckramer,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ckramer,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400092" ], @@ -569,7 +569,7 @@ ] }, { - "dn": "uid=cmcintosh,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=cmcintosh,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400039" ], @@ -596,7 +596,7 @@ ] }, { - "dn": "uid=dbriggs,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=dbriggs,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400069" ], @@ -623,7 +623,7 @@ ] }, { - "dn": "uid=dkelly,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=dkelly,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400050" ], @@ -650,7 +650,7 @@ ] }, { - "dn": "uid=dmontes,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=dmontes,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400027" ], @@ -677,7 +677,7 @@ ] }, { - "dn": "uid=dmyers,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=dmyers,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400102" ], @@ -704,7 +704,7 @@ ] }, { - "dn": "uid=drosario,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=drosario,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400051" ], @@ -731,7 +731,7 @@ ] }, { - "dn": "uid=eduardo,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=eduardo,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400007" ], @@ -758,7 +758,7 @@ ] }, { - "dn": "uid=ekane,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ekane,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400070" ], @@ -785,7 +785,7 @@ ] }, { - "dn": "uid=ewatkins,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ewatkins,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400047" ], @@ -812,7 +812,7 @@ ] }, { - "dn": "uid=fstrong,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=fstrong,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400084" ], @@ -839,7 +839,7 @@ ] }, { - "dn": "uid=fwolfe,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=fwolfe,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400035" ], @@ -866,7 +866,7 @@ ] }, { - "dn": "uid=grobles,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=grobles,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400066" ], @@ -893,7 +893,7 @@ ] }, { - "dn": "uid=groman,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=groman,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400100" ], @@ -920,7 +920,7 @@ ] }, { - "dn": "uid=ibeard,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ibeard,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400037" ], @@ -947,7 +947,7 @@ ] }, { - "dn": "uid=ipotts,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ipotts,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400095" ], @@ -974,7 +974,7 @@ ] }, { - "dn": "uid=jbuckley,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=jbuckley,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400045" ], @@ -1001,7 +1001,7 @@ ] }, { - "dn": "uid=jburch,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=jburch,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400090" ], @@ -1028,7 +1028,7 @@ ] }, { - "dn": "uid=jgould,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=jgould,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400046" ], @@ -1055,7 +1055,7 @@ ] }, { - "dn": "uid=jmaynard,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=jmaynard,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400088" ], @@ -1082,7 +1082,7 @@ ] }, { - "dn": "uid=jmccann,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=jmccann,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400064" ], @@ -1109,7 +1109,7 @@ ] }, { - "dn": "uid=jmccarty,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=jmccarty,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400089" ], @@ -1136,7 +1136,7 @@ ] }, { - "dn": "uid=jmckee,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=jmckee,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400057" ], @@ -1163,7 +1163,7 @@ ] }, { - "dn": "uid=jpreston,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=jpreston,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400052" ], @@ -1190,7 +1190,7 @@ ] }, { - "dn": "uid=jwu,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=jwu,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400054" ], @@ -1217,7 +1217,7 @@ ] }, { - "dn": "uid=kanderson,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=kanderson,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400004" ], @@ -1244,7 +1244,7 @@ ] }, { - "dn": "uid=kfisher,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=kfisher,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400076" ], @@ -1271,7 +1271,7 @@ ] }, { - "dn": "uid=kgonzalez,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=kgonzalez,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400097" ], @@ -1298,7 +1298,7 @@ ] }, { - "dn": "uid=kmills,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=kmills,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400086" ], @@ -1325,7 +1325,7 @@ ] }, { - "dn": "uid=kreyes,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=kreyes,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400091" ], @@ -1352,7 +1352,7 @@ ] }, { - "dn": "uid=kvonneu,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=kvonneu,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400005" ], @@ -1379,7 +1379,7 @@ ] }, { - "dn": "uid=lbaldwin,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=lbaldwin,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400033" ], @@ -1406,7 +1406,7 @@ ] }, { - "dn": "uid=lbarnett,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=lbarnett,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400105" ], @@ -1433,7 +1433,7 @@ ] }, { - "dn": "uid=lcohen,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=lcohen,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400083" ], @@ -1460,7 +1460,7 @@ ] }, { - "dn": "uid=ldennis,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ldennis,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400096" ], @@ -1487,7 +1487,7 @@ ] }, { - "dn": "uid=lduran,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=lduran,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400038" ], @@ -1514,7 +1514,7 @@ ] }, { - "dn": "uid=lgross,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=lgross,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400085" ], @@ -1541,7 +1541,7 @@ ] }, { - "dn": "uid=lhall,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=lhall,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400049" ], @@ -1568,7 +1568,7 @@ ] }, { - "dn": "uid=llarson,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=llarson,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400067" ], @@ -1595,7 +1595,7 @@ ] }, { - "dn": "uid=marcher,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=marcher,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400055" ], @@ -1622,7 +1622,7 @@ ] }, { - "dn": "uid=mbailey,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mbailey,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400068" ], @@ -1649,7 +1649,7 @@ ] }, { - "dn": "uid=mbutler,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mbutler,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400087" ], @@ -1676,7 +1676,7 @@ ] }, { - "dn": "uid=mcarney,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mcarney,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400043" ], @@ -1703,7 +1703,7 @@ ] }, { - "dn": "uid=mclay,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mclay,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400062" ], @@ -1730,7 +1730,7 @@ ] }, { - "dn": "uid=mdyer,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mdyer,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400036" ], @@ -1757,7 +1757,7 @@ ] }, { - "dn": "uid=mestes,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mestes,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400077" ], @@ -1784,7 +1784,7 @@ ] }, { - "dn": "uid=mgates,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mgates,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400063" ], @@ -1811,7 +1811,7 @@ ] }, { - "dn": "uid=mjefferson,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mjefferson,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400053" ], @@ -1838,7 +1838,7 @@ ] }, { - "dn": "uid=mkrause,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mkrause,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400073" ], @@ -1865,7 +1865,7 @@ ] }, { - "dn": "uid=mlong,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mlong,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400078" ], @@ -1892,7 +1892,7 @@ ] }, { - "dn": "uid=mtravis,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mtravis,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400098" ], @@ -1919,7 +1919,7 @@ ] }, { - "dn": "uid=mvang,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mvang,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400030" ], @@ -1946,7 +1946,7 @@ ] }, { - "dn": "uid=mvaughan,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=mvaughan,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400065" ], @@ -1973,7 +1973,7 @@ ] }, { - "dn": "uid=ngutierrez,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ngutierrez,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400032" ], @@ -2000,7 +2000,7 @@ ] }, { - "dn": "uid=nmartinez,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=nmartinez,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400040" ], @@ -2027,7 +2027,7 @@ ] }, { - "dn": "uid=ostein,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=ostein,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400006" ], @@ -2054,7 +2054,7 @@ ] }, { - "dn": "uid=pdawn,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=pdawn,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400009" ], @@ -2081,7 +2081,7 @@ ] }, { - "dn": "uid=rcannon,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=rcannon,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400103" ], @@ -2108,7 +2108,7 @@ ] }, { - "dn": "uid=rhale,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=rhale,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400056" ], @@ -2135,7 +2135,7 @@ ] }, { - "dn": "uid=sbecker,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=sbecker,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400021" ], @@ -2162,7 +2162,7 @@ ] }, { - "dn": "uid=scohen,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=scohen,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400044" ], @@ -2189,7 +2189,7 @@ ] }, { - "dn": "uid=sfrazier,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=sfrazier,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400020" ], @@ -2216,7 +2216,7 @@ ] }, { - "dn": "uid=sgregory,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=sgregory,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400018" ], @@ -2243,7 +2243,7 @@ ] }, { - "dn": "uid=smaldonado,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=smaldonado,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400022" ], @@ -2270,7 +2270,7 @@ ] }, { - "dn": "uid=smcclure,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=smcclure,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400072" ], @@ -2297,7 +2297,7 @@ ] }, { - "dn": "uid=sparrish,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=sparrish,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400074" ], @@ -2324,7 +2324,7 @@ ] }, { - "dn": "uid=sroberson,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=sroberson,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400028" ], @@ -2351,7 +2351,7 @@ ] }, { - "dn": "uid=sshelton,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=sshelton,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400019" ], @@ -2378,7 +2378,7 @@ ] }, { - "dn": "uid=sshepherd,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=sshepherd,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400041" ], @@ -2405,7 +2405,7 @@ ] }, { - "dn": "uid=t,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=t,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400003" ], @@ -2435,7 +2435,7 @@ ] }, { - "dn": "uid=tburch,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=tburch,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400101" ], @@ -2462,7 +2462,7 @@ ] }, { - "dn": "uid=tcase,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=tcase,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400099" ], @@ -2489,7 +2489,7 @@ ] }, { - "dn": "uid=tosborn,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=tosborn,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400042" ], @@ -2516,7 +2516,7 @@ ] }, { - "dn": "uid=uevans,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=uevans,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400034" ], @@ -2543,7 +2543,7 @@ ] }, { - "dn": "uid=vgriffin,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=vgriffin,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400081" ], @@ -2570,7 +2570,7 @@ ] }, { - "dn": "uid=vmendoza,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=vmendoza,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400029" ], @@ -2597,7 +2597,7 @@ ] }, { - "dn": "uid=wryan,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=wryan,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400061" ], @@ -2624,7 +2624,7 @@ ] }, { - "dn": "uid=zlloyd,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=zlloyd,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400016" ], @@ -2651,7 +2651,7 @@ ] }, { - "dn": "uid=zmarsh,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=zmarsh,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400017" ], @@ -2678,7 +2678,7 @@ ] }, { - "dn": "uid=zoe,cn=users,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "uid=zoe,cn=users,cn=accounts,dc=example,dc=com", "gidnumber": [ "835400008" ], diff --git a/install/ui/test/data/user_memberof_group.json b/install/ui/test/data/user_memberof_group.json index e8f7a8fa5..d1816e149 100644 --- a/install/ui/test/data/user_memberof_group.json +++ b/install/ui/test/data/user_memberof_group.json @@ -13,7 +13,7 @@ "description": [ "Default group for all users" ], - "dn": "cn=ipausers,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=ipausers,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1662072956" ], @@ -41,7 +41,7 @@ "description": [ "Limited admins who can edit other users" ], - "dn": "cn=editors,cn=groups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=editors,cn=groups,cn=accounts,dc=example,dc=com", "gidnumber": [ "1662072957" ], diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 31a4f9c6a..50f87bfb8 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -264,7 +264,6 @@ class i18n_messages(Command): "certificate_hold": _("Certificate Hold"), "cessation_of_operation": _("Cessation of Operation"), "common_name": _("Common Name"), - "enter_csr": _("Enter the Base64-encoded CSR below"), "expires_on": _("Expires On"), "fingerprints": _("Fingerprints"), "issue_certificate": _("Issue New Certificate for ${entity} ${primary_key}"), @@ -281,6 +280,7 @@ class i18n_messages(Command): "privilege_withdrawn": _("Privilege Withdrawn"), "reason": _("Reason for Revocation"), "remove_from_crl": _("Remove from CRL"), + "request_message": _("<ol><li>Create a private key in a secure location, for example:<br/># openssl genrsa -out key.pem</li><li>Create a CSR with subject CN=${hostname},O=${realm}, for example:<br/># openssl req -new -key key.pem -out cert.csr \\<br/> -subj '/O=${realm}/CN=${hostname}'</li><li>Copy and paste the CSR below:</li></ol>"), "restore_certificate": _("Restore Certificate for ${entity} ${primary_key}"), "restore_confirmation": _("To confirm your intention to restore this certificate, click the \"Restore\" button."), "revoke_certificate": _("Revoke Certificate for ${entity} ${primary_key}"), |