From be18497f6e8b3c3252de486f7763fcd893195f31 Mon Sep 17 00:00:00 2001
From: Jirka Tomasek <jtomasek@redhat.com>
Date: Fri, 19 Oct 2012 11:46:17 +0200
Subject: [PATCH 1/2] Added mailer settings to conductor-settings.yml

---
 .../aeolus/templates/conductor-settings.yml   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/recipes/aeolus/templates/conductor-settings.yml b/recipes/aeolus/templates/conductor-settings.yml
index e8508dd..85188d9 100644
--- a/recipes/aeolus/templates/conductor-settings.yml
+++ b/recipes/aeolus/templates/conductor-settings.yml
@@ -13,7 +13,7 @@
   :oauth:
     :consumer_key: <%= iwhd_oauth_user %>
     :consumer_secret: <%= iwhd_oauth_password %>
- 
+
 :imagefactory:
   :url: https://localhost:8075/imagefactory
   :oauth:
@@ -22,3 +22,20 @@
 
 :session:
   :timeout: 15 # minutes
+
+:action_mailer:
+  :delivery_method: sendmail # or smtp
+  # define smtp_settings if you use smtp as delivery_method
+  # :smtp_settings:
+  #   :address: smtp.gmail.com
+  #   :port: 587
+  #   :domain: example.aeolusproject.org
+  #   :user_name: <username>,
+  #   :password: <password>
+  #   :authentication: plain
+  #   :enable_starttls_auto: true
+  :default_url_options:
+    :host: localhost/conductor
+    :protocol: https
+  :default_from: admin@aeolusproject.org
+  :password_reset_token_timeout: 120 #minutes

From e7ff05ca24aba1ddadeb631e2dda06403c36bada Mon Sep 17 00:00:00 2001
From: Jirka Tomasek <jtomasek@redhat.com>
Date: Fri, 19 Oct 2012 14:57:24 +0200
Subject: [PATCH 2/2] fixed conductor/login.pp to post to correct url

---
 recipes/aeolus/manifests/conductor/login.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/aeolus/manifests/conductor/login.pp b/recipes/aeolus/manifests/conductor/login.pp
index 9eed163..d9305b3 100644
--- a/recipes/aeolus/manifests/conductor/login.pp
+++ b/recipes/aeolus/manifests/conductor/login.pp
@@ -1,7 +1,7 @@
 # login to the aeolus conductor
 define aeolus::conductor::login($password){
   web_request{ "${name}-conductor-login":
-    post         => 'https://localhost/conductor/user_session',
+    post         => 'https://localhost/conductor/user_sessions',
     parameters  => { 'username'    => "$name", 'password' => "$password",
                      'commit'                 => 'submit' },
     returns     => '200',