diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage index 6444e0992..f338a6970 100755 --- a/install/tools/ipa-compat-manage +++ b/install/tools/ipa-compat-manage @@ -82,6 +82,8 @@ def main(): retval = 0 files = [paths.SCHEMA_COMPAT_ULDIF] + installutils.check_server_configuration() + options, args = parse_options() if len(args) != 1: diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index d44375cfa..16b391493 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -32,6 +32,7 @@ from ipaserver.install import (replication, installutils, bindinstance, from ipalib import api, errors from ipalib.util import has_managed_topology from ipapython import ipautil, ipaldap, version +from ipapython.admintool import ScriptError from ipapython.dn import DN logger = logging.getLogger(os.path.basename(__file__)) @@ -408,6 +409,7 @@ def exit_on_managed_topology(what, hint="topologysegment"): def main(): + installutils.check_server_configuration() options, args = parse_options() # Just initialize the environment. This is so the installer can have @@ -496,7 +498,7 @@ try: main() except KeyboardInterrupt: sys.exit(1) -except SystemExit as e: +except (SystemExit, ScriptError) as e: sys.exit(e) except Exception as e: sys.exit("unexpected error: %s" % e) diff --git a/ipaserver/advise/base.py b/ipaserver/advise/base.py index 40f2e65dc..07b1431e8 100644 --- a/ipaserver/advise/base.py +++ b/ipaserver/advise/base.py @@ -30,6 +30,7 @@ from ipalib.errors import ValidationError from ipaplatform.paths import paths from ipapython import admintool from ipapython.ipa_log_manager import Filter +from ipaserver.install import installutils """ @@ -418,6 +419,7 @@ class IpaAdvise(admintool.AdminTool): def validate_options(self): super(IpaAdvise, self).validate_options(needs_root=False) + installutils.check_server_configuration() if len(self.args) > 1: raise self.option_parser.error("You can only provide one " diff --git a/ipaserver/install/ipa_pkinit_manage.py b/ipaserver/install/ipa_pkinit_manage.py index c54bb14f5..4a79bba5d 100644 --- a/ipaserver/install/ipa_pkinit_manage.py +++ b/ipaserver/install/ipa_pkinit_manage.py @@ -9,6 +9,7 @@ import logging from ipalib import api from ipaplatform.paths import paths from ipapython.admintool import AdminTool +from ipaserver.install import installutils from ipaserver.install.krbinstance import KrbInstance, is_pkinit_enabled logger = logging.getLogger(__name__) @@ -21,6 +22,7 @@ class PKINITManage(AdminTool): def validate_options(self): super(PKINITManage, self).validate_options(needs_root=True) + installutils.check_server_configuration() option_parser = self.option_parser diff --git a/ipaserver/install/ipa_server_upgrade.py b/ipaserver/install/ipa_server_upgrade.py index 1e52bca97..7643b97f2 100644 --- a/ipaserver/install/ipa_server_upgrade.py +++ b/ipaserver/install/ipa_server_upgrade.py @@ -35,6 +35,8 @@ class ServerUpgrade(admintool.AdminTool): def validate_options(self): super(ServerUpgrade, self).validate_options(needs_root=True) + installutils.check_server_configuration() + if self.options.force: self.options.skip_version_check = True diff --git a/ipaserver/install/ipa_winsync_migrate.py b/ipaserver/install/ipa_winsync_migrate.py index 0399b9b7b..43330ad50 100644 --- a/ipaserver/install/ipa_winsync_migrate.py +++ b/ipaserver/install/ipa_winsync_migrate.py @@ -350,7 +350,7 @@ class WinsyncMigrate(admintool.AdminTool): # Check if the IPA server is configured before attempting to migrate try: installutils.check_server_configuration() - except RuntimeError as e: + except admintool.ScriptError as e: sys.exit(e) # Finalize API