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

Atlassian modules fixes #31408

Merged
merged 4 commits into from
Nov 9, 2017
Merged

Atlassian modules fixes #31408

merged 4 commits into from
Nov 9, 2017

Conversation

jbgi
Copy link
Contributor

@jbgi jbgi commented Nov 8, 2017

Motivation for this change

Make Atlassian modules actually work + update to latest versions.

Things done
  • Tested using nixops
  • Built on platform(s)
    • NixOS
  • Tested execution of all binary files (usually in ./result/bin/)

Sorry, something went wrong.

jbgi added 4 commits November 8, 2017 21:10

Unverified

The committer email address is not verified.
 - Properly handle optional configuration.
 - Use ExecStart/ExecStop instead of script/stopScript.
 Only the Oracle JRE is supported by Atlassian appsAtlassian apps
 (see https://jira.atlassian.com/browse/JRASERVER-46152)
 Plus Atlassian apps are non free so the switch logic always chose
 Oracle JRE anyway.
 Option is kept in case someone want to patch apps to support openjdk.
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 8, 2017
@orivej orivej requested a review from fpletz November 9, 2017 11:51
@globin globin merged commit 1209773 into NixOS:master Nov 9, 2017
@globin
Copy link
Member

globin commented Nov 9, 2017

Thanks, some stuff wasn't backported from our fork properly apparently, and the openjdk support had been removed recently by atlassian..

@orivej
Copy link
Contributor

orivej commented Nov 9, 2017

@globin Have you merged using "rebase and merge" option? This does not leave the reference from the commit to the PR, which is often needed for context when reading git history. (I use https://github.com/grosser/git-whence to look up the PR that introduced a commit.) "Rebase and merge --no-ff" would be ideal for pretty and complete git log, but since its not available "Merge pull request" is the only sensible option.

@jbgi
Copy link
Contributor Author

jbgi commented Nov 20, 2017

Could this be backported to 17.09 stable? (alongside 0e790b9)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants