summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2016-12-02 09:10:41 +0100
committerJan Cholasta <jcholast@redhat.com>2017-02-22 08:07:48 +0000
commitfe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25 (patch)
treefaf107dfdb15e1eb26667620f8b0faaaf84500e2 /install
parentcf25ea7e300cdada57bd964acb4393cc11ad333e (diff)
downloadfreeipa-fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25.tar.gz
freeipa-fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25.tar.xz
freeipa-fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25.zip
scripts, tests: explicitly set confdir in the rest of server code
Commit 1e6a204b4372bbbfb722a00370a5ce4e34406b9f added explicit confdir setting to api.bootstrap() calls of a randomly selected portion of server-side scripts and tests. This commit adds it to the rest of server-side code for consistency. https://fedorahosted.org/freeipa/ticket/6389 Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'install')
-rwxr-xr-xinstall/tools/ipa-compat-manage5
-rwxr-xr-xinstall/tools/ipa-csreplica-manage6
-rwxr-xr-xinstall/tools/ipa-managed-entries3
3 files changed, 11 insertions, 3 deletions
diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage
index 77468b4fc..a29a92fab 100755
--- a/install/tools/ipa-compat-manage
+++ b/install/tools/ipa-compat-manage
@@ -100,7 +100,10 @@ def main():
if dirman_password is None:
sys.exit("Directory Manager password required")
- api.bootstrap(context='cli', in_server=True, debug=options.debug)
+ api.bootstrap(context='cli',
+ in_server=True,
+ debug=options.debug,
+ confdir=paths.ETC_IPA)
api.finalize()
api.Backend.ldap2.connect()
diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage
index 2d534d443..4c4cf3d77 100755
--- a/install/tools/ipa-csreplica-manage
+++ b/install/tools/ipa-csreplica-manage
@@ -413,7 +413,11 @@ def main():
api_env['log'] = None # turn off logging for non-root
api.bootstrap(
- context='cli', in_server=True, verbose=options.verbose, **api_env
+ context='cli',
+ in_server=True,
+ verbose=options.verbose,
+ confdir=paths.ETC_IPA,
+ **api_env
)
api.finalize()
diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries
index 59f14fcf1..efcf3ecf6 100755
--- a/install/tools/ipa-managed-entries
+++ b/install/tools/ipa-managed-entries
@@ -24,6 +24,7 @@ import re
import sys
from optparse import OptionParser # pylint: disable=deprecated-module
+from ipaplatform.paths import paths
from ipapython import config
from ipaserver.install import installutils
from ipalib import api, errors
@@ -72,7 +73,7 @@ def main():
sys.exit("Unrecognized action [" + args[0] + "]")
standard_logging_setup(None, debug=options.debug)
- api.bootstrap(context='cli', debug=options.debug)
+ api.bootstrap(context='cli', debug=options.debug, confdir=paths.ETC_IPA)
api.finalize()
api.Backend.ldap2.connect(bind_pw=options.dirman_password)