[Modules 5519] Add port parameter in class mod::jk #1679
Conversation
|
Finally, a working spec test with probably enough contexts |
spec/classes/mod/jk_spec.rb
Outdated
| @@ -12,13 +12,19 @@ | |||
| it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]') } | |||
| end | |||
|
|
|||
| context "RHEL 6 with only required facts and no parameters" do | |||
| default_ip = '192.168.1.1' | |||
There was a problem hiding this comment.
as I mentioned in #1671, let statements should be used in these cases, e.g.:
let (:default_ip) { '192.168.1.1' }There was a problem hiding this comment.
I had a problem in #1671 regarding this change. I'll wait 'till we solve that then replicate the solution here.
| @@ -2165,7 +2166,31 @@ class { '::apache::mod::jk': | |||
|
|
|||
| **Parameters within `apache::mod::jk`**: | |||
|
|
|||
| The best source for understanding the `mod_jk` parameters is the [official documentation](https://tomcat.apache.org/connectors-doc/reference/apache.html), except for \*file_content: | |||
| The best source for understanding the `mod_jk` parameters is the [official documentation](https://tomcat.apache.org/connectors-doc/reference/apache.html), except for: | |||
There was a problem hiding this comment.
yes! we like linking to official docs!
manifests/mod/jk.pp
Outdated
| Optional[String] $ip = undef, | ||
| Pattern[/^\d+$/] $port = '80', | ||
| Boolean $add_listen = true, | ||
| # Conf file content | ||
| $workers_file = undef, |
There was a problem hiding this comment.
please align the rest of these =
manifests/mod/jk.pp
Outdated
| @@ -9,6 +9,11 @@ | |||
| # https://tomcat.apache.org/connectors-doc/reference/apache.html | |||
| # | |||
| class apache::mod::jk ( | |||
| # Binding to mod_jk | |||
| Optional[String] $ip = undef, | |||
| Pattern[/^\d+$/] $port = '80', | |||
There was a problem hiding this comment.
is there a particular reason you're not using the Integer type?
There was a problem hiding this comment.
The variable $port is used as a string - interpolated in another string in a ensure_resource declaration
|
@EmersonPrado could you please rebase this on master? basically just adding this work to your previous PR for paths. |
|
I rebased and pushed again, but it didn't come out right: And now the PR has an unsolved conflict. I did solve all conflicts locally while rebasing, so I believe to have pushed a clean tree. Do you have a hint? It's the first time I rebase something I have already pushed (in fact, I always thought I shouldn't), so I don't really know how to solve this. |
|
I think I could solve all conflicts manually from the Web interface. Are we done? |
|
@EmersonPrado you have to force push ( |
* Add ip and port parameters to class apache::mod::jk * Add parameter to make binding conditional in class apache::mod::jk * Add binding parameters validation in apache::mod::jk * Add default binding params in mod::jk spec test * Add context with alternative binding port in mod::jk spec test * Add context without binding in mod::jk spec test * Add in README binding parameters info for class mod::jk * Add in README use cases for apache::mod::jk binding params * Change default param treatment in mod::jk to allow spec test * Correct parameters in mod::jk spec test * Use variable $facts for ip param default * Use facts for param defaults in mod::jk spec test * Correct facts hash reference in class mod::jk * Change param default treatment to allow spec test in class mod::jk * Add resource count in all contexts in mod::jk spec test * Change resource count for specific resource checks in mod::jk spec test * Add context for supplied IP param in mod::jk spec test * Align parameter values in class mod::jk * Change param apache::mod::jk::port type to integer * Change param apache::mod::jk::port type to integer in spec test
New parameters allow changing binding settings for
mod_jk. This way, one can use Apache withmod_jkand a reverse proxy / cache receiving requests and forwarding to Apache in a different port, for example.