[Ovirt-devel] [PATCH 2/4] A basically working LDAP base is started.

[Darryl L. Pierce]

---
 wui/src/config/ldap.yml                            |    4 +++
 .../scaffold_active_ldap/templates/ldap.yml        |   21 ++++++++++++++++++++
 wui/src/vendor/plugins/active_ldap/init.rb         |    2 +-
 3 files changed, 26 insertions(+), 1 deletions(-)
 create mode 100644 wui/src/config/ldap.yml
 create mode 100644 wui/src/vendor/plugins/active_ldap/generators/scaffold_active_ldap/templates/ldap.yml

diff --git a/wui/src/config/ldap.yml b/wui/src/config/ldap.yml
new file mode 100644
index 0000000..c8b167e
--- /dev/null
+++ b/wui/src/config/ldap.yml
@@ -0,0 +1,4 @@
+development:
+  hostname: ldap.rdu.redhat.com
+  port: 389
+  base: dc=redhat,dc=com
diff --git a/wui/src/vendor/plugins/active_ldap/generators/scaffold_active_ldap/templates/ldap.yml b/wui/src/vendor/plugins/active_ldap/generators/scaffold_active_ldap/templates/ldap.yml
new file mode 100644
index 0000000..720ec39
--- /dev/null
+++ b/wui/src/vendor/plugins/active_ldap/generators/scaffold_active_ldap/templates/ldap.yml
@@ -0,0 +1,21 @@
+development:
+  host: 127.0.0.1
+  port: 389
+  base: dc=devel,dc=local,dc=net
+  bind_dn: cn=admin,dc=local,dc=net
+  password: secret
+
+test:
+  host: 127.0.0.1
+  port: 389
+  base: dc=test,dc=local,dc=net
+  bind_dn: cn=admin,dc=local,dc=net
+  password: secret
+
+production:
+  host: 127.0.0.1
+  port: 389
+  method: :tls
+  base: dc=production,dc=local,dc=net
+  bind_dn: cn=admin,dc=local,dc=net
+  password: secret
diff --git a/wui/src/vendor/plugins/active_ldap/init.rb b/wui/src/vendor/plugins/active_ldap/init.rb
index 35e19d4..fa1484a 100644
--- a/wui/src/vendor/plugins/active_ldap/init.rb
+++ b/wui/src/vendor/plugins/active_ldap/init.rb
@@ -1,7 +1,7 @@
 require_library_or_gem 'active_ldap'
 ActiveLdap::Base.logger ||= RAILS_DEFAULT_LOGGER
 
-required_version = ["0", "9", "1"]
+required_version = ["0", "10", "0"]
 if (ActiveLdap::VERSION.split(".") <=> required_version) < 0
   ActiveLdap::Base.class_eval do
     format = _("You need ActiveLdap %s or later")
-- 
1.5.4.1