diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2012-08-23 12:38:45 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-09-17 18:43:59 -0400 |
| commit | 4f76c143d2f2036af02677469c542f563a10158d (patch) | |
| tree | 8ed4716135c53486710950b453f17bb71f36c658 /ipalib/constants.py | |
| parent | 3dd31a875650c7fe7c67ca6b47f2058c1181dafb (diff) | |
| download | freeipa-4f76c143d2f2036af02677469c542f563a10158d.tar.gz freeipa-4f76c143d2f2036af02677469c542f563a10158d.tar.xz freeipa-4f76c143d2f2036af02677469c542f563a10158d.zip | |
Use Dogtag 10 only when it is available
Put the changes from Ade's dogtag 10 patch into namespaced constants in
dogtag.py, which are then referenced in the code.
Make ipaserver.install.CAInstance use the service name specified in the
configuration. Uninstallation, where config is removed before CA uninstall,
also uses the (previously) configured value.
This and Ade's patch address https://fedorahosted.org/freeipa/ticket/2846
Diffstat (limited to 'ipalib/constants.py')
| -rw-r--r-- | ipalib/constants.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ipalib/constants.py b/ipalib/constants.py index 57265da55..81db0202f 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -141,9 +141,11 @@ DEFAULT_CONFIG = ( ('ca_port', 80), ('ca_agent_port', 443), ('ca_ee_port', 443), - ('ca_install_port', 8080), - ('ca_agent_install_port', 8443), - ('ca_ee_install_port', 8443), + # For the following ports, None means a default specific to the installed + # Dogtag version. + ('ca_install_port', None), + ('ca_agent_install_port', None), + ('ca_ee_install_port', None), # Special CLI: @@ -156,6 +158,7 @@ DEFAULT_CONFIG = ( ('enable_ra', False), ('ra_plugin', 'selfsign'), ('wait_for_attr', False), + ('dogtag_version', 9), # Used when verifying that the API hasn't changed. Not for production. ('validate_api', False), |