diff --git a/install/share/krb5.conf.template b/install/share/krb5.conf.template index e3420e537..4d417416a 100644 --- a/install/share/krb5.conf.template +++ b/install/share/krb5.conf.template @@ -19,6 +19,7 @@ $OTHER_LIBDEFAULTS $REALM = { kdc = $FQDN:88 master_kdc = $FQDN:88 + kpasswd_server = $FQDN:464 admin_server = $FQDN:749 default_domain = $DOMAIN pkinit_anchors = FILE:$KDC_CA_BUNDLE_PEM diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index 25f49efea..50980d209 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -1262,6 +1262,29 @@ def enable_server_snippet(): tasks.restore_context(paths.KRB5_FREEIPA_SERVER) +def setup_kpasswd_server(krb): + logger.info("[Setup kpasswd_server]") + aug = Augeas( + flags=Augeas.NO_LOAD | Augeas.NO_MODL_AUTOLOAD, + loadpath=paths.USR_SHARE_IPA_DIR, + ) + try: + aug.transform("IPAKrb5", paths.KRB5_CONF) + aug.load() + + kpass_srv_path = "/files{}/realms/{}/kpasswd_server" + kpass_srv_path = kpass_srv_path.format(paths.KRB5_CONF, krb.realm) + + if aug.match(kpass_srv_path): + return + + aug.set(kpass_srv_path, f"{krb.fqdn}:464") + aug.save() + + finally: + aug.close() + + def ntpd_cleanup(fqdn, fstore): sstore = sysrestore.StateFile(paths.SYSRESTORE) timeconf.restore_forced_timeservices(sstore, 'ntpd') @@ -1874,6 +1897,7 @@ def upgrade_configuration(): setup_spake(krb) setup_pkinit(krb) enable_server_snippet() + setup_kpasswd_server(krb) # Must be executed after certificate_renewal_update # (see function docstring for details)