diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-03-27 14:25:18 +0100 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2013-04-15 16:56:12 -0400 |
| commit | e736e75ce9724ae8298a5b69d093313cd6e62b60 (patch) | |
| tree | c50816419b158762d6173c51dc2d74942a64cec3 /install/tools | |
| parent | 006ab23c6d404fd3ee1a33ac339c77789254860e (diff) | |
| download | freeipa-e736e75ce9724ae8298a5b69d093313cd6e62b60.tar.gz freeipa-e736e75ce9724ae8298a5b69d093313cd6e62b60.tar.xz freeipa-e736e75ce9724ae8298a5b69d093313cd6e62b60.zip | |
Drop --selfsign server functionality
Design: http://freeipa.org/page/V3/Drop_selfsign_functionality
Ticket: https://fedorahosted.org/freeipa/ticket/3494
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-ca-install | 2 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 2ebce60c2..2046b5fb8 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -112,7 +112,7 @@ def main(): api.bootstrap(in_server=True) api.finalize() - if certs.ipa_self_signed(): + if api.env.ra_plugin == 'selfsign': sys.exit('A selfsign CA can not be added') # get the directory manager password diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index d400dbabf..e0b07d3be 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -1004,16 +1004,10 @@ def main(): ds = dsinstance.DsInstance(fstore=fstore) ds.init_info( realm_name, host_name, domain_name, dm_password, - False, options.subject, 1101, 1100, None) + options.subject, 1101, 1100, None) if setup_ca: - # Clean up any previous self-signed CA that may exist - try: - os.remove(certs.CA_SERIALNO) - except: - pass - if not dogtag.install_constants.SHARED_DB: cs = cainstance.CADSInstance( host_name, realm_name, domain_name, dm_password) |