diff options
-rwxr-xr-x | install/tools/ipactl | 5 | ||||
-rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/install/tools/ipactl b/install/tools/ipactl index 581aacc36..44a61ae8d 100755 --- a/install/tools/ipactl +++ b/install/tools/ipactl @@ -35,6 +35,7 @@ from ipapython import config, dogtag from ipaplatform import tasks from ipapython.dn import DN from ipaplatform import services +from ipaplatform.paths import paths class IpactlError(ScriptError): pass @@ -221,7 +222,7 @@ def ipa_start(options): # that are already running and just return, so that the # stop() method of the base class will simply fill in the # service file again - os.unlink(ipaservices.SVC_LIST_FILE) + os.unlink(paths.SVC_LIST_FILE) dirsrv = services.knownservices.dirsrv try: @@ -303,7 +304,7 @@ def ipa_stop(options): # remove file with list of started services try: - os.unlink(ipaservices.SVC_LIST_FILE) + os.unlink(paths.SVC_LIST_FILE) except OSError: pass diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 1e17dee4c..c20ad1a09 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -42,6 +42,8 @@ try: run, user_input, CalledProcessError, file_exists, dir_exists, realm_to_suffix) from ipaplatform.tasks import tasks + from ipaplatform import services + from ipaplatform.paths import paths from ipapython import ipautil, sysrestore, version, certmonger, ipaldap from ipapython import kernel_keyring from ipapython.config import IPAOptionParser @@ -1991,6 +1993,7 @@ pref("network.negotiate-auth.allow-proxies", true); """ FIREFOX_PREFERENCES_FILENAME = "all-ipa.js" +FIREFOX_PREFERENCES_REL_PATH = "browser/defaults/preferences" def configure_firefox(options, statestore, domain): try: @@ -2001,19 +2004,19 @@ def configure_firefox(options, statestore, domain): # Check user specified location of firefox install directory if options.firefox_dir is not None: pref_path = os.path.join(options.firefox_dir, - ipaservices.FIREFOX_PREFERENCES_REL_PATH) + FIREFOX_PREFERENCES_REL_PATH) if dir_exists(pref_path): preferences_dir = pref_path else: root_logger.error("Directory '%s' does not exists." % pref_path) else: # test if firefox is installed - if file_exists(ipaservices.FIREFOX_EXEC): + if file_exists(paths.FIREFOX): # find valid preferences path - for path in ipaservices.FIREFOX_INSTALL_DIRS: + for path in [paths.LIB_FIREFOX, paths.LIB64_FIREFOX]: pref_path = os.path.join(path, - ipaservices.FIREFOX_PREFERENCES_REL_PATH) + FIREFOX_PREFERENCES_REL_PATH) if dir_exists(pref_path): preferences_dir = pref_path break |