few updates after testing with ldap cookbook

MattPumphrey · Aug 29, 2014 · 7bf47ea · 7bf47ea
1 parent 67f2641
commit 7bf47ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/providers/aci.rb b/providers/aci.rb
@@ -119,7 +119,7 @@ def whyrun_supported?
     #   and ( hours );
     # )
 
-    dirsrv_entry dn do
+    ldap_entry dn do
       host   new_resource.host
       port   new_resource.port
       credentials new_resource.credentials
@@ -138,7 +138,7 @@ def whyrun_supported?
 
       access_control_instruction = @current_resource[new_resource.label.to_s]
 
-      dirsrv_entry @current_resource[:dn] do
+      ldap_entry @current_resource[:dn] do
         host   new_resource.host
         port   new_resource.port
         credentials new_resource.credentials

diff --git a/providers/config.rb b/providers/config.rb
@@ -28,7 +28,7 @@ def whyrun_supported?
 
   converge_by("Setting #{new_resource.attr}: #{new_resource.value}") do
     ldap_entry new_resource.attr do
-      dn     'cn=config'
+      distinguished_name 'cn=config'
       host   new_resource.host
       port   new_resource.port
       credentials new_resource.credentials
@@ -42,7 +42,7 @@ def whyrun_supported?
 
   converge_by("Unsetting #{new_resource.attr}") do
     ldap_entry new_resource.attr do
-      dn     'cn=config'
+      distinguished_name 'cn=config'
       host   new_resource.host
       port   new_resource.port
       credentials new_resource.credentials

diff --git a/providers/instance.rb b/providers/instance.rb
@@ -60,7 +60,7 @@ def whyrun_supported?
     config[:credentials] = Chef::EncryptedDataBagItem.load( new_resource.cookbook_name, config[:credentials], secret ).to_hash
   end
 
-  unless config[:credentials].kind_of?(Hash) and config[:credentials].key?('userdn') and config[:credentials].key?('password')
+  unless config[:credentials].kind_of?(Hash) and config[:credentials].key?('bind_dn') and config[:credentials].key?('password')
     raise "Invalid credentials: #{config[:credentials]}"
   end
 

diff --git a/templates/default/setup.inf.erb b/templates/default/setup.inf.erb
@@ -24,7 +24,7 @@ SysUser         = dirsrv
 AddOrgEntries    = <%= @add_org_entries %>
 AddSampleEntries = <%= @add_sample_entries %>
 InstallLdifFile  = <%= @preseed_ldif %>
-RootDN           = <%= @credentials['userdn'] %>
+RootDN           = <%= @credentials['bind_dn'] %>
 RootDNPwd        = <%= @credentials['password'] %>
 ServerIdentifier = <%= @instance %>
 ServerPort       = <%= @port %>