diff options
| author | Martin Basti <mbasti@redhat.com> | 2013-11-04 11:52:02 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2013-11-15 13:30:39 +0100 |
| commit | 478dc1e828da6ec0365a42300c441bcf0424bd90 (patch) | |
| tree | 12d175b6ccf734632a0f6d0dbb49a227add1d15a /ipapython | |
| parent | 487865131cc6486c40802cfcabc59db1a01f3f16 (diff) | |
| download | freeipa.git-478dc1e828da6ec0365a42300c441bcf0424bd90.tar.gz freeipa.git-478dc1e828da6ec0365a42300c441bcf0424bd90.tar.xz freeipa.git-478dc1e828da6ec0365a42300c441bcf0424bd90.zip | |
ipa-client-install: Added options to configure firefox
Option --configure-firefox configures firefox to use Kerberos
credentials within IPA domain
Optional option --firefox-dir=DIR allows to user to specify non-standard
path where firefox install directory is placed.
Part of ticket: https://fedorahosted.org/freeipa/ticket/3821
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/platform/base/__init__.py | 6 | ||||
| -rw-r--r-- | ipapython/platform/fedora16/__init__.py | 8 | ||||
| -rw-r--r-- | ipapython/platform/fedora18/__init__.py | 8 | ||||
| -rw-r--r-- | ipapython/platform/redhat/__init__.py | 8 |
4 files changed, 27 insertions, 3 deletions
diff --git a/ipapython/platform/base/__init__.py b/ipapython/platform/base/__init__.py index e2aa33fa..48b89cfc 100644 --- a/ipapython/platform/base/__init__.py +++ b/ipapython/platform/base/__init__.py @@ -48,6 +48,12 @@ wellknownports = { SVC_LIST_FILE = "/var/run/ipa/services.list" +# Firefox paths +FIREFOX_EXEC = "/usr/bin/firefox" +FIREFOX_INSTALL_DIRS = ["/usr/lib64/firefox", "/usr/lib/firefox"] +# /firefox/install/dir/FIREFOX_PREFERENCES_REL_PATH +FIREFOX_PREFERENCES_REL_PATH = "browser/defaults/preferences" + class AuthConfig(object): """ AuthConfig class implements system-independent interface to configure diff --git a/ipapython/platform/fedora16/__init__.py b/ipapython/platform/fedora16/__init__.py index 26a6afd2..ef6e37e7 100644 --- a/ipapython/platform/fedora16/__init__.py +++ b/ipapython/platform/fedora16/__init__.py @@ -38,7 +38,8 @@ from ipapython.platform.fedora16.service import f16_service, Fedora16Services # and restorecon is installed. __all__ = ['authconfig', 'service', 'knownservices', 'backup_and_replace_hostname', 'restore_context', 'check_selinux_status', - 'restore_network_configuration', 'timedate_services'] + 'restore_network_configuration', 'timedate_services', 'FIREFOX_EXEC', + 'FIREFOX_INSTALL_DIRS', 'FIREFOX_PREFERENCES_REL_PATH'] # Just copy a referential list of timedate services timedate_services = list(base.timedate_services) @@ -50,3 +51,8 @@ backup_and_replace_hostname = redhat.backup_and_replace_hostname restore_context = selinux.restore_context check_selinux_status = selinux.check_selinux_status restore_network_configuration = redhat.restore_network_configuration + +# Firefox paths +FIREFOX_EXEC = base.FIREFOX_EXEC +FIREFOX_INSTALL_DIRS = base.FIREFOX_INSTALL_DIRS +FIREFOX_PREFERENCES_REL_PATH = base.FIREFOX_PREFERENCES_REL_PATH diff --git a/ipapython/platform/fedora18/__init__.py b/ipapython/platform/fedora18/__init__.py index d12bdcad..b7963c78 100644 --- a/ipapython/platform/fedora18/__init__.py +++ b/ipapython/platform/fedora18/__init__.py @@ -44,7 +44,8 @@ from ipapython.platform import fedora16, base # and restorecon is installed. __all__ = ['authconfig', 'service', 'knownservices', 'backup_and_replace_hostname', 'restore_context', 'check_selinux_status', - 'restore_network_configuration', 'timedate_services'] + 'restore_network_configuration', 'timedate_services', 'FIREFOX_EXEC', + 'FIREFOX_INSTALL_DIRS', 'FIREFOX_PREFERENCES_REL_PATH'] # Just copy a referential list of timedate services timedate_services = list(base.timedate_services) @@ -111,3 +112,8 @@ service = fedora16.service knownservices = fedora16.knownservices restore_context = fedora16.restore_context check_selinux_status = fedora16.check_selinux_status + +# Firefox paths +FIREFOX_EXEC = base.FIREFOX_EXEC +FIREFOX_INSTALL_DIRS = base.FIREFOX_INSTALL_DIRS +FIREFOX_PREFERENCES_REL_PATH = base.FIREFOX_PREFERENCES_REL_PATH diff --git a/ipapython/platform/redhat/__init__.py b/ipapython/platform/redhat/__init__.py index f7680e7e..cd7b105b 100644 --- a/ipapython/platform/redhat/__init__.py +++ b/ipapython/platform/redhat/__init__.py @@ -48,7 +48,8 @@ from ipapython.platform.redhat.service import redhat_service, RedHatServices # and restorecon is installed. __all__ = ['authconfig', 'service', 'knownservices', 'backup_and_replace_hostname', 'restore_context', 'check_selinux_status', - 'restore_network_configuration', 'timedate_services'] + 'restore_network_configuration', 'timedate_services', 'FIREFOX_EXEC', + 'FIREFOX_INSTALL_DIRS', 'FIREFOX_PREFERENCES_REL_PATH'] # Just copy a referential list of timedate services timedate_services = list(base.timedate_services) @@ -131,3 +132,8 @@ def restore_network_configuration(fstore, statestore): filepath = '/etc/sysconfig/network' if fstore.has_file(filepath): fstore.restore_file(filepath) + +# Firefox paths +FIREFOX_EXEC = base.FIREFOX_EXEC +FIREFOX_INSTALL_DIRS = base.FIREFOX_INSTALL_DIRS +FIREFOX_PREFERENCES_REL_PATH = base.FIREFOX_PREFERENCES_REL_PATH |