---
recipes/aeolus/manifests/conductor.pp | 5 +++++
recipes/aeolus/templates/conductor-settings.yml | 12 +++++-------
recipes/aeolus/templates/etc-ldap_fluff.yml | 11 +++++++++++
3 files changed, 21 insertions(+), 7 deletions(-)
create mode 100644 recipes/aeolus/templates/etc-ldap_fluff.yml
diff --git a/recipes/aeolus/manifests/conductor.pp
b/recipes/aeolus/manifests/conductor.pp
index 96405c1..30882c3 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -28,6 +28,11 @@ class aeolus::conductor inherits aeolus {
require => Package['aeolus-conductor'],
mode => 640, owner => 'root', group => 'aeolus'}
+ file{"/etc/ldap_fluff.yml":
+ content => template("aeolus/etc-ldap_fluff.yml"),
+ require => Package['aeolus-conductor'],
+ mode => 640, owner => 'root', group => 'aeolus'}
+
file{"/usr/share/aeolus-conductor/config/initializers/secret_token.rb":
content => template("aeolus/secret_token.rb"),
require => Package['aeolus-conductor']}
diff --git a/recipes/aeolus/templates/conductor-settings.yml
b/recipes/aeolus/templates/conductor-settings.yml
index dec51d3..91fc83b 100644
--- a/recipes/aeolus/templates/conductor-settings.yml
+++ b/recipes/aeolus/templates/conductor-settings.yml
@@ -3,13 +3,11 @@
:auth:
# supported strategies: database, ldap
:strategy: database
- :ldap:
- :host: localhost
- # '%s' expression in username_dn string will be replaced
- # by user's login
- # username_dn: "deltacloud\%s"
- :username_dn: uid=%s,ou=People,dc=my-domain,dc=com
- # :port: 389
+:groups:
+ # allows locally-managed groups
+ :enable_local: true
+ # allows ldap-managed groups
+ :enable_ldap: true
:iwhd:
:url:
http://localhost:9090
:oauth:
diff --git a/recipes/aeolus/templates/etc-ldap_fluff.yml
b/recipes/aeolus/templates/etc-ldap_fluff.yml
new file mode 100644
index 0000000..b7dd04a
--- /dev/null
+++ b/recipes/aeolus/templates/etc-ldap_fluff.yml
@@ -0,0 +1,11 @@
+---
+host: localhost
+port: 389
+encryption:
+base_dn: ou=People,dc=my-domain,dc=com
+group_base: ou=Groups,dc=my-domain,dc=com
+server_type: :posix
+service_user:
+service_pass:
+anon_queries: false
+ad_domain:
--
1.7.6.5