diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-10-22 17:05:27 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-10-22 18:26:59 +0200 |
| commit | 2b01f71bef71229e5b10fa839a1844a6342b36bd (patch) | |
| tree | 37d306cead59c83e323d900ba3a543b99bcb5214 | |
| parent | f2032ca2cab3048021956707ec4ff74be69108d4 (diff) | |
DNSSEC: store status of services only before first install
DNS installer allows to reinstall DNS and DNSSEC, so the status of
services should be stored only for first time.
Reviewed-By: Petr Spacek <pspacek@redhat.com>
| -rw-r--r-- | ipaserver/install/odsexporterinstance.py | 7 | ||||
| -rw-r--r-- | ipaserver/install/opendnssecinstance.py | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ipaserver/install/odsexporterinstance.py b/ipaserver/install/odsexporterinstance.py index e9ba51027..85c64aba4 100644 --- a/ipaserver/install/odsexporterinstance.py +++ b/ipaserver/install/odsexporterinstance.py @@ -146,9 +146,10 @@ class ODSExporterInstance(service.Service): def __disable_signerd(self): signerd_service = services.knownservices.ods_signerd - - self.backup_state("singerd_running", signerd_service.is_running()) - self.backup_state("singerd_enabled", signerd_service.is_enabled()) + if self.get_state("singerd_running") is None: + self.backup_state("singerd_running", signerd_service.is_running()) + if self.get_state("singerd_enabled") is None: + self.backup_state("singerd_enabled", signerd_service.is_enabled()) # disable default opendnssec signer daemon signerd_service.stop() diff --git a/ipaserver/install/opendnssecinstance.py b/ipaserver/install/opendnssecinstance.py index c92818f1a..edd35df7a 100644 --- a/ipaserver/install/opendnssecinstance.py +++ b/ipaserver/install/opendnssecinstance.py @@ -88,8 +88,10 @@ class OpenDNSSECInstance(service.Service): def create_instance(self, fqdn, realm_name, generate_master_key=True, kasp_db_file=None): - self.backup_state("enabled", self.is_enabled()) - self.backup_state("running", self.is_running()) + if self.get_state("enabled") is None: + self.backup_state("enabled", self.is_enabled()) + if self.get_state("running") is None: + self.backup_state("running", self.is_running()) self.fqdn = fqdn self.realm = realm_name self.suffix = ipautil.realm_to_suffix(self.realm) |