mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Move CACERT definition to a single place.
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
This commit is contained in:
committed by
Petr Viktorin
parent
4c761108e8
commit
fea7163e87
@@ -38,6 +38,7 @@ from ipalib import api, errors
|
||||
from ipalib.util import (validate_zonemgr, normalize_zonemgr,
|
||||
get_dns_forward_zone_update_policy, get_dns_reverse_zone_update_policy,
|
||||
normalize_zone, get_reverse_zone_default, zone_is_reverse)
|
||||
from ipalib.constants import CACERT
|
||||
|
||||
NAMED_CONF = '/etc/named.conf'
|
||||
RESOLV_CONF = '/etc/resolv.conf'
|
||||
@@ -206,7 +207,7 @@ def dns_container_exists(fqdn, suffix, dm_password=None, ldapi=False, realm=None
|
||||
if ldapi:
|
||||
conn = ipaldap.IPAdmin(host=fqdn, ldapi=True, realm=realm)
|
||||
else:
|
||||
conn = ipaldap.IPAdmin(host=fqdn, port=636, cacert=service.CACERT)
|
||||
conn = ipaldap.IPAdmin(host=fqdn, port=636, cacert=CACERT)
|
||||
|
||||
if dm_password:
|
||||
conn.do_simple_bind(bindpw=dm_password)
|
||||
|
||||
@@ -40,11 +40,11 @@ from ipaserver.install import ldapupdate
|
||||
from ipaserver.install import replication
|
||||
from ipaserver.install import sysupgrade
|
||||
from ipalib import errors
|
||||
from ipalib.constants import CACERT
|
||||
from ipapython.dn import DN
|
||||
|
||||
SERVER_ROOT_64 = "/usr/lib64/dirsrv"
|
||||
SERVER_ROOT_32 = "/usr/lib/dirsrv"
|
||||
CACERT="/etc/ipa/ca.crt"
|
||||
|
||||
DS_USER = 'dirsrv'
|
||||
DS_GROUP = 'dirsrv'
|
||||
|
||||
@@ -35,6 +35,7 @@ from ipapython import dogtag
|
||||
from ipapython.ipa_log_manager import *
|
||||
from ipaserver.install import sysupgrade
|
||||
from ipalib import api
|
||||
from ipalib.constants import CACERT
|
||||
|
||||
HTTPD_DIR = "/etc/httpd"
|
||||
SSL_CONF = HTTPD_DIR + "/conf.d/ssl.conf"
|
||||
|
||||
@@ -38,6 +38,7 @@ from ipaserver.install import installutils
|
||||
from ipapython import services as ipaservices
|
||||
from ipapython import ipaldap
|
||||
from ipalib.session import ISO8601_DATETIME_FMT
|
||||
from ipalib.constants import CACERT
|
||||
from ConfigParser import SafeConfigParser
|
||||
|
||||
"""
|
||||
@@ -149,7 +150,7 @@ class Backup(admintool.AdminTool):
|
||||
'/etc/krb5.conf',
|
||||
'/etc/group',
|
||||
'/etc/passwd',
|
||||
'/etc/ipa/ca.crt',
|
||||
CACERT,
|
||||
'/etc/ipa/default.conf',
|
||||
'/etc/dirsrv/ds.keytab',
|
||||
'/etc/ntp.conf',
|
||||
|
||||
@@ -34,6 +34,7 @@ from ipapython.dn import DN
|
||||
from ipapython import version
|
||||
from ipalib import api
|
||||
from ipalib import errors
|
||||
from ipalib.constants import CACERT
|
||||
|
||||
|
||||
class ReplicaPrepare(admintool.AdminTool):
|
||||
@@ -139,7 +140,7 @@ class ReplicaPrepare(admintool.AdminTool):
|
||||
def check_pkcs12(self, pkcs12_file, pkcs12_pin):
|
||||
installutils.check_pkcs12(
|
||||
pkcs12_info=(pkcs12_file, pkcs12_pin),
|
||||
ca_file='/etc/ipa/ca.crt',
|
||||
ca_file=CACERT,
|
||||
hostname=self.replica_fqdn)
|
||||
|
||||
def ask_for_options(self):
|
||||
@@ -356,7 +357,7 @@ class ReplicaPrepare(admintool.AdminTool):
|
||||
def copy_misc_files(self):
|
||||
self.log.info("Copying additional files")
|
||||
|
||||
self.copy_info_file("/etc/ipa/ca.crt", "ca.crt")
|
||||
self.copy_info_file(CACERT, "ca.crt")
|
||||
preferences_filename = "/usr/share/ipa/html/preferences.html"
|
||||
if ipautil.file_exists(preferences_filename):
|
||||
self.copy_info_file(preferences_filename, "preferences.html")
|
||||
|
||||
@@ -28,11 +28,10 @@ from ipapython import admintool
|
||||
from ipapython.dn import DN
|
||||
from ipapython.ipautil import user_input, write_tmp_file
|
||||
from ipalib import api, errors
|
||||
from ipalib.constants import CACERT
|
||||
from ipaserver.install import certs, dsinstance, httpinstance, installutils
|
||||
from ipaserver.plugins.ldap2 import ldap2
|
||||
|
||||
CACERT = "/etc/ipa/ca.crt"
|
||||
|
||||
class ServerCertInstall(admintool.AdminTool):
|
||||
command_name = 'ipa-server-certinstall'
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ from ipapython import ipautil
|
||||
from ipapython import services as ipaservices
|
||||
from ipapython import kernel_keyring
|
||||
from ipalib import errors
|
||||
from ipalib.constants import CACERT
|
||||
from ipapython.ipa_log_manager import *
|
||||
from ipapython.dn import DN
|
||||
|
||||
@@ -435,7 +436,7 @@ class KrbInstance(service.Service):
|
||||
|
||||
# Finally copy the cacert in the krb directory so we don't
|
||||
# have any selinux issues with the file context
|
||||
shutil.copyfile("/etc/ipa/ca.crt", "/var/kerberos/krb5kdc/cacert.pem")
|
||||
shutil.copyfile(CACERT, "/var/kerberos/krb5kdc/cacert.pem")
|
||||
|
||||
def __add_anonymous_pkinit_principal(self):
|
||||
princ = "WELLKNOWN/ANONYMOUS"
|
||||
|
||||
@@ -25,12 +25,12 @@ import os
|
||||
import ldap
|
||||
|
||||
from ipalib import api, errors
|
||||
from ipalib.constants import CACERT
|
||||
from ipapython import services as ipaservices
|
||||
from ipapython.ipa_log_manager import *
|
||||
from ipapython import ipautil, dogtag, ipaldap
|
||||
from ipapython.dn import DN
|
||||
|
||||
CACERT = "/etc/ipa/ca.crt"
|
||||
# the default container used by AD for user entries
|
||||
WIN_USER_CONTAINER = DN(('cn', 'Users'))
|
||||
# the default container used by IPA for user entries
|
||||
|
||||
@@ -30,8 +30,6 @@ from ipapython.dn import DN
|
||||
from ipapython.ipa_log_manager import *
|
||||
from ipalib import errors
|
||||
|
||||
CACERT = "/etc/ipa/ca.crt"
|
||||
|
||||
# Autobind modes
|
||||
AUTO = 1
|
||||
ENABLED = 2
|
||||
|
||||
Reference in New Issue
Block a user