Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes/aeolus/manifests/conductor/login.pp
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
19 changes: 18 additions & 1 deletion recipes/aeolus/templates/conductor-settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
:oauth:
:consumer_key: <%= iwhd_oauth_user %>
:consumer_secret: <%= iwhd_oauth_password %>

:imagefactory:
:url: https://localhost:8075/imagefactory
:oauth:
Expand All @@ -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