Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only include ssl bits when ssl is enabled #128

Merged
merged 1 commit into from
Oct 8, 2015
Merged

Only include ssl bits when ssl is enabled #128

merged 1 commit into from
Oct 8, 2015

Conversation

jyaworski
Copy link
Member

Hello:

I noticed that when ssl isn't enabled, that running rd-jobs from the cli produces ssl warnings:

[root@rundeck rundeck]# rd-jobs list -p Infrastructure
Error: Error making server request to http://rundeck:4440: Error occurred while trying to authenticate to server: java.lang.RuntimeException: Unexpected error: java.security.InvalidAlgorithmParameterException: the trustAnchors parameter must be non-empty

This PR only calls the SSL bits when it's enabled.

@jyaworski
Copy link
Member Author

This works, but the test fails because I'm no longer including the class. I'm open to ideas on how to fix this; I'm not great with tests.

@liamjbennett
Copy link
Member

We could do this a little better by switching to an alternative syntax e.g.

include 'rundeck::config::global::framework'
...

if $ssl_enabled {
   include 'rundeck::config::global::ssl'

   Class['rundeck::config::global::framework'] ->
   Class['rundeck::config::global::rundeck_config'] ->
   ....
   Class['rundeck::config::global::ssl']
} else {
  Class['rundeck::config::global::framework'] ->
   ...
  Class[''rundeck::config::global::rundeck_config']
}

...

@jyaworski
Copy link
Member Author

@liamjbennett this is finally ready to merge.

liamjbennett pushed a commit that referenced this pull request Oct 8, 2015
Only include ssl bits when ssl is enabled
@liamjbennett liamjbennett merged commit 1a5729e into voxpupuli:master Oct 8, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants