diff options
| author | Karl MacMillan <kmacmill@redhat.com> | 2007-12-11 12:55:38 -0500 |
|---|---|---|
| committer | Karl MacMillan <kmacmill@redhat.com> | 2007-12-11 12:55:38 -0500 |
| commit | abdbc50683fd4d3ec9e699eb19c8ed96b0cef0dd (patch) | |
| tree | 69e81065e14f0cc91d7c71453de4900d6697203b /ipa-server | |
| parent | 158b4e8ff4704b967d4049e2a16f9b32fbb33b80 (diff) | |
| download | freeipa-abdbc50683fd4d3ec9e699eb19c8ed96b0cef0dd.tar.gz freeipa-abdbc50683fd4d3ec9e699eb19c8ed96b0cef0dd.tar.xz freeipa-abdbc50683fd4d3ec9e699eb19c8ed96b0cef0dd.zip | |
Import correct httpinstance.py
Diffstat (limited to 'ipa-server')
| -rw-r--r-- | ipa-server/ipaserver/httpinstance.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ipa-server/ipaserver/httpinstance.py b/ipa-server/ipaserver/httpinstance.py index 448a9d97b..1799cca07 100644 --- a/ipa-server/ipaserver/httpinstance.py +++ b/ipa-server/ipaserver/httpinstance.py @@ -34,6 +34,7 @@ from ipa.ipautil import * HTTPD_DIR = "/etc/httpd" SSL_CONF = HTTPD_DIR + "/conf.d/ssl.conf" NSS_CONF = HTTPD_DIR + "/conf.d/nss.conf" +NSS_DIR = HTTPD_DIR + "/alias" selinux_warning = """WARNING: could not set selinux boolean httpd_can_network_connect to true. The web interface may not function correctly until this boolean is @@ -66,12 +67,13 @@ class HTTPInstance(service.Service): self.fqdn = fqdn self.realm = realm - self.start_creation(6, "Configuring the web interface") + self.start_creation(7, "Configuring the web interface") self.__disable_mod_ssl() self.__set_mod_nss_port() self.__configure_http() self.__create_http_keytab() + self.__setup_ssl() self.step("restarting httpd") self.restart() @@ -149,7 +151,8 @@ class HTTPInstance(service.Service): def __setup_ssl(self): self.step("Setting up ssl") ds_ca = certs.CertDB(dsinstance.config_dirname(self.realm)) - ca = certs.CertDB(dirname) + ca = certs.CertDB(NSS_DIR) + ds_ca.cur_serial = 2000 ca.create_from_cacert(ds_ca.cacert_fname) - ca.create_server_cert_extca("Server-Cert", "cn=%s,ou=Apache Web Server" % self.fqdn, ds_ca) + ca.create_server_cert("Server-Cert", "cn=%s,ou=Apache Web Server" % self.fqdn, ds_ca) |