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

Huntgroup #96

Merged
merged 3 commits into from
Mar 12, 2018
Merged

Huntgroup #96

merged 3 commits into from
Mar 12, 2018

Conversation

amateo
Copy link
Collaborator

@amateo amateo commented Mar 12, 2018

There was duplicate functionality for huntgroups since #93. Since that PR, freeradius::module::preprocess and freeradius::module::huntgroup wasn't working.
This PR deprecates freeradius::module::preprocess (while still works).

Latest versions of concat module removed this parameter.
There is a duplicate with freeradius::huntgroup
The concat resource for huntgroups is already defined at init.pp
@djjudas21
Copy link
Owner

Can you briefly explain these changes, please? I don't use huntgroups and I didn't write this original code 😄

@djjudas21 djjudas21 self-assigned this Mar 12, 2018
@amateo
Copy link
Collaborator Author

amateo commented Mar 12, 2018

I made a PR #59 in Feb'17. That PR added freeradius::module::preprocess to configure preprocess module (basically, to enable the module and initialize an empty huntgroup file), and freeradius::module::huntgroup was added too to create huntgroups entries.

Later, PR #93 did the same in a different way. In that PR the empty huntgroup file was created directly in init.pp file and freeradius::huntgroup is added to add huntgroups entries.

The problem is that this later PR conflicts with the former.

What I have done in this new PR is:

  • Changed freeradius::module::preprocess so that it just enables preprocess module (and doesn't create the empty huntgroup file)
  • Changed freeradius::module::huntgroup to call freeradius::huntgroup and display a deprecation warning message.

This way, anyone can continue using huntgroups in the same that #59 or in the #93 way, without any problem.

@djjudas21
Copy link
Owner

OK, sounds good. Thanks!

@djjudas21 djjudas21 merged commit f0d2075 into djjudas21:master Mar 12, 2018
@amateo amateo deleted the huntgroup branch March 13, 2018 08:52
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.

None yet

2 participants