Skip to content
This repository has been archived by the owner on Feb 4, 2020. It is now read-only.

Introduce auth parameter support in puppet-uchiwa #64

Merged
merged 2 commits into from
Dec 8, 2015

Conversation

queeno
Copy link
Contributor

@queeno queeno commented Dec 7, 2015

The auth parameter has been introduced in uchiwa 0.13.0 in order to allow the user to specify a static RSA keypair for JWT signature validation.

This PR introduces support for this param in the puppet-uchiwa module.

@solarkennedy
Copy link
Contributor

I think this obsoletes #48

@queeno
Copy link
Contributor Author

queeno commented Dec 7, 2015

@solarkennedy I think #61 has already obsoleted #48

@@ -20,7 +20,7 @@
"port": <%= @port %>,
"user": "<%= @user %>",
"pass": "<%= @pass %>",
"refresh": <%= @refresh %><%= ',' if @users.size > 0 %>
"refresh": <%= @refresh %><%= ',' if @users.size > 0 or @auth.size == 2 %>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels strange. I think eventually we need to move to deploying json files directly with ruby instead of writing out an erb

@queeno
Copy link
Contributor Author

queeno commented Dec 8, 2015

@solarkennedy I completely agree with you.

Uchiwa has just introduced capability for loading multiple configuration files from a given directory sensu/uchiwa@ff0651b, but the functionality hasn't been released yet.

We would also need to adapt the init.d file to provide the functionality and specify a directory to load config files from.

Until we get there, unfortunately, we'll have to stick with this horrible puppet template :(

Btw, I'm not sure why travis is failing all the tests, I might force a rebuild?

@queeno queeno force-pushed the introduce_static_rsa_keys branch from dc66fb8 to 78a906f Compare December 8, 2015 01:19
@solarkennedy
Copy link
Contributor

I'm... not sure why the tests started failing. @queeno do they pass locally for you?

@queeno
Copy link
Contributor Author

queeno commented Dec 8, 2015

Yep it's weird... I raised #65

Apparently Travis wants the gems grouped in :test in the Gemfile. I don't understand why ungrouped gem wouldn't work. I can even see they get installed during the build, but then the tests fail.

All the tests pass locally for this PR.

@solarkennedy
Copy link
Contributor

Got it. Can you merge master?

@queeno
Copy link
Contributor Author

queeno commented Dec 8, 2015

Yep I will rebase

Simon Aquino added 2 commits December 8, 2015 18:07
This commit introduces the auth paramter, which can be used - starting
from uchiwa 0.13.0 in order to specify a static RSA keypair for JWT
signature validation.
This commit contains a puppet-rspec test for the newly introduced auth
parameter.
@queeno queeno force-pushed the introduce_static_rsa_keys branch from 78a906f to c541d0b Compare December 8, 2015 18:07
solarkennedy added a commit that referenced this pull request Dec 8, 2015
Introduce auth parameter support in puppet-uchiwa
@solarkennedy solarkennedy merged commit b3f9ed8 into Yelp:master Dec 8, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants