diff --git a/install/share/opendnssec_conf.template b/install/share/opendnssec_conf.template index 3d01fb415..5658693ac 100644 --- a/install/share/opendnssec_conf.template +++ b/install/share/opendnssec_conf.template @@ -33,7 +33,7 @@ $KASP_DB - PT3600S + $INTERVAL diff --git a/ipaserver/install/opendnssecinstance.py b/ipaserver/install/opendnssecinstance.py index df39705a4..6354521b4 100644 --- a/ipaserver/install/opendnssecinstance.py +++ b/ipaserver/install/opendnssecinstance.py @@ -179,6 +179,12 @@ class OpenDNSSECInstance(service.Service): # add pin to template sub_conf_dict = self.conf_file_dict sub_conf_dict['PIN'] = pin + if paths.ODS_KSMUTIL is not None and os.path.exists(paths.ODS_KSMUTIL): + # OpenDNSSEC 1.4 + sub_conf_dict['INTERVAL'] = 'PT3600S' + else: + # OpenDNSSEC 2.x + sub_conf_dict['INTERVAL'] = '' ods_conf_txt = ipautil.template_file( os.path.join(paths.USR_SHARE_IPA_DIR, "opendnssec_conf.template"),