From 5fabc1c9ced0efc7be32b5361529641a21667c36 Mon Sep 17 00:00:00 2001 From: Karl Kornel <akkornel@stanford.edu> Date: Tue, 18 Aug 2015 23:24:09 -0700 Subject: [PATCH] base::kerberos: Copy changes from static krb5.conf to template krb5.conf. Some changes (such as the major changes to WIN.SLAC.STANFORD.EDU) were not copied to the template file. --- templates/kerberos/krb5.conf.erb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/templates/kerberos/krb5.conf.erb b/templates/kerberos/krb5.conf.erb index e626318..12513f2 100644 --- a/templates/kerberos/krb5.conf.erb +++ b/templates/kerberos/krb5.conf.erb @@ -68,7 +68,6 @@ master_kdc = kerberos-dev.stanford.edu:88 admin_server = kerberos-dev.stanford.edu kpasswd_server = kerberos-dev.stanford.edu - default_domain = heimdal.stanford.edu kadmind_port = 749 } WIN.STANFORD.EDU = { @@ -113,7 +112,11 @@ default_domain = slac.stanford.edu } WIN.SLAC.STANFORD.EDU = { - kdc = winmaster2.win.slac.stanford.edu + kdc = dc01.slac.stanford.edu:88 + kdc = dc02.slac.stanford.edu:88 + kdc = dc03.slac.stanford.edu:88 + master_kdc = dc01.slac.stanford.edu:88 + admin_server = dc01.slac.stanford.edu default_domain = win.slac.stanford.edu } ATHENA.MIT.EDU = { @@ -164,6 +167,8 @@ .oit.duke.edu = stanford.edu win.stanford.edu = WIN.STANFORD.EDU .win.stanford.edu = WIN.STANFORD.EDU + atragon.stanford.edu = WIN.STANFORD.EDU + itcert.stanford.edu = WIN.STANFORD.EDU daper.stanford.edu = IT.WIN.STANFORD.EDU gsbworkspace.stanford.edu = IT.WIN.STANFORD.EDU infraappprod.stanford.edu = IT.WIN.STANFORD.EDU @@ -173,9 +178,14 @@ workspace.stanford.edu = IT.WIN.STANFORD.EDU ms.stanford.edu = MS.STANFORD.EDU .ms.stanford.edu = MS.STANFORD.EDU + mscert1.stanford.edu = MS.STANFORD.EDU + msweb2.stanford.edu = EX.MS.STANFORD.EDU + windows-ms.stanford.edu = EX.MS.STANFORD.EDU nt.stanford.edu = NT.STANFORD.EDU .nt.stanford.edu = NT.STANFORD.EDU ntcert1.stanford.edu = NT.STANFORD.EDU + ntweb2.stanford.edu = TYR.NT.STANFORD.EDU + windows-nt.stanford.edu = TYR.NT.STANFORD.EDU guest.stanford.edu = GUEST.STANFORD.EDU .guest.stanford.edu = GUEST.STANFORD.EDU guest-mgmt.stanford.edu = GUEST.STANFORD.EDU @@ -186,6 +196,7 @@ guestuat-mgmt.stanford.edu = GUESTUAT.STANFORD.EDU guestuatidmweb.stanford.edu = GUESTUAT.STANFORD.EDU .slac.stanford.edu = SLAC.STANFORD.EDU + .win.slac.stanford.edu = WIN.SLAC.STANFORD.EDU .isc.org = ISC.ORG mit.edu = ATHENA.MIT.EDU .mit.edu = ATHENA.MIT.EDU -- GitLab