search

voxpupuli / puppet-jira

Atlassian JIRA Puppet Module
https://forge.puppet.com/puppet/jira
Apache License 2.0
62 stars 143 forks source link

Adapting templates to state of 8.7.1 tarball, while keeping required … #329

Closed SimonHoenscheid closed 3 years ago

SimonHoenscheid commented 4 years ago

Pull Request (PR) description

This adapts the templates for java-check, server.xml and setenv to the state of the 8.7.1 tarball, while keeping required modifications in place.

I thought about setting stuff depending on the installed java version, however not everyone installs java also via puppet and if ones does it, it must not necessarily be via the java puppet module. Maybe we need an additional parameter to the module stating the java version?

This Pull Request (PR) fixes the following issues

Fixes #300

SimonHoenscheid commented 4 years ago

closes #317

SimonHoenscheid commented 4 years ago

tested with current version, for backwards compat, there should be a diffrent template for lower versions. @timdeluxe do you know which version changed the files?

timdeluxe commented 4 years ago

tested with current version, for backwards compat, there should be a diffrent template for lower versions. @timdeluxe do you know which version changed the files?

Not really, i am sorry. I just took the 8.7.1 state and tried to adapt it as smartly as possible

ekohl commented 3 years ago

Looks like there is now a conflict. Please take a look at https://github.com/voxpupuli/puppet-jira/pull/341 and https://github.com/voxpupuli/puppet-jira/pull/334 as well since they focus on some bigger upgrades.

timdeluxe commented 3 years ago

Looks like there is now a conflict. Please take a look at #341 and #334 as well since they focus on some bigger upgrades.

I am very confused about all the loose ends and the many PRs now existing. I tried to dig through them and this is my conclusion:

334 includes #341 and is green, while #341 is not.

My proposal: Merge #334 and close #341 unmerged.

326 is already merged and a good idea to solve the java version topic. #326 makes template/setenv.sh.erb part of #329 and #317 invalid/obsolete. The only thing left is to update templates/check-java.sh.erb and templates/server.xml.erb to reflect current state of original jira tar file. The changes there should be backwards compatible with older jira (7.x) and java versions (8.x). The changes to both files are identical in #329 and #317, so we just need someone to decide if @SimonHoenscheid updates his PR or i update mine (update = drop our changes to setenv.sh.erb in favor of the master state updated by #326). Depending on the decision the other PR should be dropped (closed unmerged).

In case my conclusion is not completely wrong: Can someone roll the dice? :D

kenyon commented 3 years ago

@timdeluxe if it doesn't matter, whoever updates their PR first can have it merged.

ekohl commented 3 years ago

So this module did deserve some love. We just merged https://github.com/voxpupuli/puppet-jira/pull/334. Now the module has acceptance tests so we have a much better tool in place against regressions. Please rebase. Then @kenyon is right that we pick the PR that looks best.

timdeluxe commented 3 years ago

I was too dumb to update my #317 and therefore closed it. Instead i raised #348 which now should update the missing parts. Checks just ran green there.

oranenj commented 3 years ago

I just did a rather large conversion of ERB templates into EPP in #354.

I can take a look at updating server.xml etc after that's merged, but I'd prefer not to work with ERB...

timdeluxe commented 3 years ago

@oranenj No need to update, you already worked with the updated server.xml which was merged in #348

@SimonHoenscheid / @ekohl / @igalic Can you please close this PR unmerged? It is obsolete now, setenv stuff was made/merged in #326 and rest was made in #348.

oranenj commented 3 years ago

@timdeluxe I'll double-check that server.xml matches upstream eventually anyway.

I'll close this PR since rebasing it is probably more work than necessary with all the other things being shuffled around. Once I'm done with doing the changes I feel need to be done, I'll try to give it some time for anyone interested to suggest adjustments before any API changes become finalized by a release.