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 /ipaserver/install/httpinstance.py | |
| 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 'ipaserver/install/httpinstance.py')
| -rw-r--r-- | ipaserver/install/httpinstance.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index e134fbef3..6da212ce5 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -63,15 +63,13 @@ class HTTPInstance(service.Service): def create_instance(self, realm, fqdn, domain_name, dm_password=None, autoconfig=True, pkcs12_info=None, - self_signed_ca=False, subject_base=None, - auto_redirect=True, ca_file=None): + subject_base=None, auto_redirect=True, ca_file=None): self.fqdn = fqdn self.realm = realm self.domain = domain_name self.dm_password = dm_password self.suffix = ipautil.realm_to_suffix(self.realm) self.pkcs12_info = pkcs12_info - self.self_signed_ca = self_signed_ca self.principal = "HTTP/%s@%s" % (self.fqdn, self.realm) self.dercert = None self.subject_base = subject_base @@ -237,9 +235,7 @@ class HTTPInstance(service.Service): print "Adding Include conf.d/ipa-rewrite to %s failed." % NSS_CONF def __setup_ssl(self): - fqdn = None - if not self.self_signed_ca: - fqdn = self.fqdn + fqdn = self.fqdn ca_db = certs.CertDB(self.realm, host_name=fqdn, subject_base=self.subject_base) @@ -262,8 +258,6 @@ class HTTPInstance(service.Service): self.__set_mod_nss_nickname(nickname) else: - if self.self_signed_ca: - db.create_from_cacert(ca_db.cacert_fname) db.create_password_conf() self.dercert = db.create_server_cert(self.cert_nickname, self.fqdn, @@ -288,13 +282,6 @@ class HTTPInstance(service.Service): ipaservices.restore_context(certs.NSS_DIR + "/cert8.db") ipaservices.restore_context(certs.NSS_DIR + "/key3.db") - # In case this got generated as part of the install, reset the - # context - if ipautil.file_exists(certs.CA_SERIALNO): - ipaservices.restore_context(certs.CA_SERIALNO) - os.chown(certs.CA_SERIALNO, 0, pent.pw_gid) - os.chmod(certs.CA_SERIALNO, 0664) - def __setup_autoconfig(self): target_fname = '/usr/share/ipa/html/preferences.html' ipautil.copy_template_file( |