From 5c7a7f1b41febc4036c58f0874aa8304e97052b8 Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Sun, 25 Jun 2017 18:06:48 -0700
Subject: [PATCH] kerberos: add ability to override krb5_port from default of
88
---
manifests/kerberos/krb5_conf.pp | 4 ++++
templates/kerberos/etc/krb5.conf.erb | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/manifests/kerberos/krb5_conf.pp b/manifests/kerberos/krb5_conf.pp
index 21e1154..e634862 100644
--- a/manifests/kerberos/krb5_conf.pp
+++ b/manifests/kerberos/krb5_conf.pp
@@ -160,6 +160,9 @@
#
# $kpasswd_server: sets the kpasswd_server setting.
#
+# $krb5_port: sets the port number on the kdc and master-kdc entries.
+# Default: 88
+#
# NOTE! If $env is set to 'custom', then ALL of $kdcs, $master_kdc,
# $admin_server, and $kpasswd_server MUST be set. If not, Puppet will
# raise an exception.
@@ -174,6 +177,7 @@ define base::kerberos::krb5_conf (
$master_kdc = undef,
$admin_server = undef,
$kpasswd_server = undef,
+ $krb5_port = '88',
$rdns_enabled = false,
$prefer_tcp = false,
) {
diff --git a/templates/kerberos/etc/krb5.conf.erb b/templates/kerberos/etc/krb5.conf.erb
index 866feae..f77d1f6 100644
--- a/templates/kerberos/etc/krb5.conf.erb
+++ b/templates/kerberos/etc/krb5.conf.erb
@@ -63,11 +63,11 @@
<%-
@kdcs_actual.each do |kdc|
-%>
- kdc = <%= kdc %>:88
+ kdc = <%= kdc %>:<%= @krb5_port.to_s() %>
<%-
end
-%>
- master_kdc = <%= @master_kdc_actual %>:88
+ master_kdc = <%= @master_kdc_actual %>:<%= @krb5_port.to_s() %>
admin_server = <%= @admin_server_actual %>
kpasswd_server = <%= @kpasswd_server_actual %>
default_domain = stanford.edu
--
GitLab