diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 09c3100a6e..b309940d91 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -1477,6 +1477,8 @@ # gssapi => { # acceptor_name => '{HOSTNAME}', # allowed_mech => ['krb5', 'iakerb', 'ntlmssp'], +# authname => 'Kerberos 5', +# authtype => 'GSSAPI', # basic_auth => true, # basic_auth_mech => ['krb5', 'iakerb', 'ntlmssp'], # basic_ticket_timeout => 300, diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb index eaa3af9946..37e3110a0c 100644 --- a/spec/defines/vhost_spec.rb +++ b/spec/defines/vhost_spec.rb @@ -273,6 +273,8 @@ 'gssapi' => { 'acceptor_name' => '{HOSTNAME}', 'allowed_mech' => ['krb5', 'iakerb', 'ntlmssp'], + 'authname' => 'Kerberos 5', + 'authtype' => 'GSSAPI', 'basic_auth' => true, 'basic_auth_mech' => ['krb5', 'iakerb', 'ntlmssp'], 'basic_ticket_timeout' => 300, diff --git a/templates/vhost/_gssapi.epp b/templates/vhost/_gssapi.epp index 87a755a6b9..f775e54126 100644 --- a/templates/vhost/_gssapi.epp +++ b/templates/vhost/_gssapi.epp @@ -5,6 +5,8 @@ Optional[Boolean] $basic_auth = undef, Optional[Array[Enum['krb5','iakerb','ntlmssp']]] $basic_auth_mech = undef, Optional[[Integer[1]]] $basic_ticket_timeout = undef, + Optional[String[1]] $authname = undef, + Optional[String[1]] $authtype = undef, Optional[Boolean] $connection_bound = undef, Optional[Struct[{ Optional['ccache'] => Array[Stdlib::Unixpath], @@ -42,6 +44,12 @@ GssapiAllowedMech <%= $mech %> <%- } -%> <%- } -%> +<%- if $authname { -%> + AuthName "<%= $authname %>" +<%- } -%> +<%- if $authtype { -%> + AuthType <%= $authtype %> +<%- } -%> <%- if $basic_auth { -%> GssapiBasicAuth On <%- } -%>