diff options
author | Jan Cholasta <jcholast@redhat.com> | 2013-09-11 08:27:34 +0000 |
---|---|---|
committer | Petr Viktorin <pviktori@redhat.com> | 2014-03-25 16:54:54 +0100 |
commit | fea7163e87ef7b2e46fa18dc77836ec9ee92ce02 (patch) | |
tree | 0d687ebd9cf6120beafad04efd86ff9b785caf8c /install | |
parent | 4c761108e871ae029b5e1a16aaf35f9e78a3c02e (diff) | |
download | freeipa-fea7163e87ef7b2e46fa18dc77836ec9ee92ce02.tar.gz freeipa-fea7163e87ef7b2e46fa18dc77836ec9ee92ce02.tar.xz freeipa-fea7163e87ef7b2e46fa18dc77836ec9ee92ce02.zip |
Move CACERT definition to a single place.
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'install')
-rwxr-xr-x | install/tools/ipa-csreplica-manage | 3 | ||||
-rwxr-xr-x | install/tools/ipa-managed-entries | 3 | ||||
-rwxr-xr-x | install/tools/ipa-replica-install | 2 | ||||
-rwxr-xr-x | install/tools/ipa-replica-manage | 3 | ||||
-rwxr-xr-x | install/tools/ipa-server-install | 5 |
5 files changed, 7 insertions, 9 deletions
diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index 276eec964..eb589f3f9 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -27,11 +27,10 @@ from ipapython.ipa_log_manager import * from ipaserver.install import replication, installutils, bindinstance from ipalib import api, errors, util +from ipalib.constants import CACERT from ipapython import ipautil, ipaldap, version, dogtag from ipapython.dn import DN -CACERT = "/etc/ipa/ca.crt" - # dict of command name and tuples of min/max num of args needed commands = { "list":(0, 1, "[master fqdn]", ""), diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries index 458339e92..85ef597ca 100755 --- a/install/tools/ipa-managed-entries +++ b/install/tools/ipa-managed-entries @@ -25,11 +25,10 @@ from optparse import OptionParser from ipapython import ipautil, config, ipaldap from ipaserver.install import installutils from ipalib import api, errors +from ipalib.constants import CACERT from ipapython.ipa_log_manager import * from ipapython.dn import DN -CACERT = "/etc/ipa/ca.crt" - def parse_options(): usage = "%prog [options] <status|enable|disable>\n" usage += "%prog [options]\n" diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 9f420aef6..f5e7197b5 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -42,6 +42,7 @@ from ipaserver.install.installutils import (ReplicaConfig, expand_replica_info, from ipaserver.plugins.ldap2 import ldap2 from ipaserver.install import cainstance from ipalib import api, errors, util +from ipalib.constants import CACERT from ipapython import version from ipapython.config import IPAOptionParser from ipapython import sysrestore @@ -52,7 +53,6 @@ from ipapython.dn import DN import ipaclient.ntpconf log_file_name = "/var/log/ipareplica-install.log" -CACERT = "/etc/ipa/ca.crt" REPLICA_INFO_TOP_DIR = None DIRMAN_DN = DN(('cn', 'directory manager')) diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index 684000599..ee7aef881 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -32,14 +32,13 @@ from ipaserver.install import bindinstance from ipaserver.plugins import ldap2 from ipapython import version, ipaldap from ipalib import api, errors, util +from ipalib.constants import CACERT from ipapython.ipa_log_manager import * from ipapython.dn import DN from ipapython.config import IPAOptionParser from ipaclient import ipadiscovery from xmlrpclib import MAXINT -CACERT = "/etc/ipa/ca.crt" - # dict of command name and tuples of min/max num of args needed commands = { "list":(0, 1, "[master fqdn]", ""), diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 7ca34e2cf..fa1396b49 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -72,6 +72,7 @@ from ipalib import api, errors, util, x509 from ipapython.config import IPAOptionParser from ipalib.x509 import load_certificate_from_file, load_certificate_chain_from_file from ipalib.util import validate_domain_name +from ipalib.constants import CACERT from ipapython import services as ipaservices from ipapython.ipa_log_manager import * from ipapython.dn import DN @@ -1101,7 +1102,7 @@ def main(): subject_base=options.subject) # Now put the CA cert where other instances exepct it - ca.publish_ca_cert("/etc/ipa/ca.crt") + ca.publish_ca_cert(CACERT) # we now need to enable ssl on the ds ds.enable_ssl() @@ -1129,7 +1130,7 @@ def main(): 'External CA cert', 'CT,,', options.root_ca_file) # Put a CA cert where other instances expect it - with open('/etc/ipa/ca.crt', 'wb') as f: + with open(CACERT, 'wb') as f: f.write(pem_cert) # Install the CA cert for the HTTP server |