set default port for firewall #191
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@cristi1979 could I convince you to write some rspec-puppet for this change? That way we make sure we don't break it in the future |
|
Thank you for a pull request! Please check this document for how the Jenkins project handles pull requests |
|
It looks like this pull request has inadvertently grown a new commit, ruh roh! |
|
sorry, i will do a new pull request for this |
Since port parameter seems to be missing from init.pp, use the same logic to determin it as in cli_helper.pp
add possibility to disable/uninstall plugins
- add possibility to disable/uninstall plugins.
- move $plugins_host outside of if block, as it looks identical for both cases.
- rename all occurrences of ${name}.hpi with ${plugin}
For uninstall/disable, there are 2 ifs added, each with 2 execs (one for jpi an one for hpi)
if ($version == 'absent' or $version == 'uninstall') {
test -f ${plugin_dir}/${plugin} && rm -rf ${name} ${plugin} ${name}.jpi ${name}.jpi.pinned && touch ${name}.jpi.disabled
test -f ${plugin_dir}/${name}.jpi -a ! -f ${plugin_dir}/${name}.jpi.disabled && touch ${plugin_dir}/${name}.jpi.disabled
} elsif ($version == 'disable' or $version == 'disabled') {
test -f ${plugin_dir}/${name}.jpi -a ! -f ${plugin_dir}/${name}.jpi.disabled && touch ${plugin_dir}/${name}.jpi.disabled
test -f ${plugin_dir}/${plugin} -a ! -f ${plugin_dir}/${plugin}.disabled && touch ${plugin_dir}/${plugin}.disabled
} else {
}
update firewall
|
Hi, I did a rebase with only the firewall commit. |
|
I'm going to merge this and then do some refactoring in master, thanks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since port parameter seems to be missing from init.pp, use the same logic to determin it as in cli_helper.pp