Reverse changes for #12 and fix it properly

atomic-penguin · Sep 25, 2014 · 59da7f2 · 59da7f2
1 parent f117934
commit 59da7f2
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -57,6 +57,16 @@
 default['krb5']['renew_lifetime'] = '24h'
 default['krb5']['forwardable'] = 'true'
 
+default_realm =
+  if node['krb5'].key?('krb5_conf') && node['krb5']['krb5_conf'].key?('libdefaults') &&
+    node['krb5']['krb5_conf']['libdefaults'].key?('default_realm')
+    node['krb5']['krb5_conf']['libdefaults']['default_realm'].upcase
+  elsif node['krb5']['default_realm']
+    node['krb5']['default_realm'].upcase
+  else
+    'LOCAL'
+  end
+
 # Client Packages
 default['krb5']['client']['packages'] = node['krb5']['packages']
 default['krb5']['client']['authconfig'] = node['krb5']['authconfig']
@@ -67,7 +77,7 @@
 default['krb5']['krb5_conf']['logging']['admin_server'] = 'FILE:/var/log/kadmind.log'
 
 # libdefaults
-default['krb5']['krb5_conf']['libdefaults']['default_realm'] = node['krb5']['default_realm']
+default['krb5']['krb5_conf']['libdefaults']['default_realm'] = default_realm
 default['krb5']['krb5_conf']['libdefaults']['dns_lookup_realm'] = false
 default['krb5']['krb5_conf']['libdefaults']['dns_lookup_kdc'] = node['krb5']['lookup_kdc']
 default['krb5']['krb5_conf']['libdefaults']['forwardable'] = node['krb5']['forwardable']