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

Allow defining additional Tomcat connectors #205

Merged
merged 1 commit into from
Sep 3, 2020

Conversation

antaflos
Copy link
Contributor

Add a new, optional class parameter
confluence::tomcat_additional_connectors whose value is a well-formed,
complex hash as described by the new type aliases
Confluence::Tomcat_connectors and Confluence::Tomcat_attributes.
Each hash key represents a port number, and the key's value is a hash
that describes the connector's attributes and their values.

Useful for defining additional HTTP ports through which to access
Confluence. A typical use case is when Jira and Confluence run behind a
reverse proxy and application links between Jira and Confluence must be
set up. Then it is often better to allow Jira and Confluence to
communicate directly instead of through the reverse proxy, but this
requires a Tomcat connector that is configured for direct access instead
of reverse proxy access (proxyName, proxyPort, etc). Described here:
https://confluence.atlassian.com/kb/how-to-create-an-unproxied-application-link-719095740.html

Contains spec tests, documentation and examples.

A very similar PR was submitted to puppet-jira in voxpupuli/puppet-jira#316

Add a new, optional class parameter
`confluence::tomcat_additional_connectors` whose value is a well-formed,
complex hash as described by the new type aliases
`Confluence::Tomcat_connectors` and `Confluence::Tomcat_attributes`.
Each hash key represents a port number, and the key's value is a hash
that describes the connector's attributes and their values.

Useful for defining additional HTTP ports through which to access
Confluence.  A typical use case is when Jira and Confluence run behind a
reverse proxy and application links between Jira and Confluence must be
set up.  Then it is often better to allow Jira and Confluence to
communicate directly instead of through the reverse proxy, but this
requires a Tomcat connector that is configured for direct access instead
of reverse proxy access (`proxyName`, `proxyPort`, etc). Described here:
https://confluence.atlassian.com/kb/how-to-create-an-unproxied-application-link-719095740.html

Contains spec tests, documentation and examples.

A very similar PR was submitted to puppet-jira in voxpupuli/puppet-jira#316
@antaflos
Copy link
Contributor Author

I don't know why the tests fail for Puppet 5.x and not for 6.x. The errors in https://travis-ci.org/github/voxpupuli/puppet-confluence/jobs/712602003 have nothing to do with the changes from this PR:

@igalic
Copy link
Contributor

igalic commented Jul 28, 2020

that's all whitespace errors in files you didn't touch, so i reckon we can ignore this for your PR, and see to get it fixed separately.

Copy link
Contributor

@igalic igalic left a comment

Choose a reason for hiding this comment

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

👀

spec/type_aliases/tomcat_attributes_spec.rb Show resolved Hide resolved
templates/server.xml.erb Show resolved Hide resolved
@vox-pupuli-tasks
Copy link

Dear @antaflos, thanks for the PR!

This is Vox Pupuli Tasks, your friendly Vox Pupuli Github Bot. I noticed that your pull request has CI failures. Can you please have a look at the failing CI jobs?
If you need any help, you can reach out to us on our IRC channel voxpupuli on Freenode or our Slack channel voxpupuli at slack.puppet.com.
You can find my sourcecode at voxpupuli/vox-pupuli-tasks

@antaflos
Copy link
Contributor Author

antaflos commented Sep 3, 2020

Closing and reopening to trigger Travis, maybe the test failures unrelated to this change are now fixed.

@antaflos antaflos closed this Sep 3, 2020
@antaflos antaflos reopened this Sep 3, 2020
@antaflos
Copy link
Contributor Author

antaflos commented Sep 3, 2020

The checks now pass so if the PR could be merged, that'd be great :)

@igalic igalic merged commit 4868d5a into voxpupuli:master Sep 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants