Skip to content
This repository has been archived by the owner on Jan 10, 2023. It is now read-only.

Added tmpdir parameter to java args. Is needed for CIS hardened servers #38

Merged
merged 1 commit into from
Feb 8, 2017
Merged

Added tmpdir parameter to java args. Is needed for CIS hardened servers #38

merged 1 commit into from
Feb 8, 2017

Conversation

Fabian1976
Copy link
Contributor

When installing puppet-server on a server which has a tmp partition mounted with noexec option, installation will fail with a strange error message:
Caused by: org.jruby.embed.EvalFailedException: (Error) Cannot determine basic system flavour
(more details: https://github.com/puppetlabs/puppetserver/blob/master/documentation/known_issues.markdown)

Added the ability to set a different tmp folder.

@vinzent vinzent added the enhancement New feature or request label Jan 19, 2017
Copy link
Contributor

@vinzent vinzent left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution!

Looks like there are small puppet-lint errors. Could you fix them?

Also please try to rebase (git fetch upstream && git rebase upstream/master) to get the latest modulesync updates.

@Fabian1976
Copy link
Contributor Author

I'd be happy to fix the puppet-lint errors but i don't see any in the 5 lines i've added. Could you elaborate?

I've done the rebase. Nothing changed for this PR

@vinzent
Copy link
Contributor

vinzent commented Jan 20, 2017

this one: https://travis-ci.org/voxpupuli/puppet-puppetserver/jobs/189500294#L537-L538

you can see the test results when you click on the red x beside the commit. bundle exec rake lint should show on your machine too.

@Fabian1976
Copy link
Contributor Author

I missed that one because it was not part of the files changed in this pr. Sorry!

But it also seems to be allready fixed by someone else in the master branch:
027219a

@vinzent
Copy link
Contributor

vinzent commented Jan 20, 2017

if it was in the master branch and you did a rebase upstream/master it should not be in your branch anymore.

@vinzent
Copy link
Contributor

vinzent commented Jan 20, 2017

did you actually push after rebase?

@vinzent
Copy link
Contributor

vinzent commented Jan 20, 2017

i checked out your branch and ran bundle exec rake lint it shows the error.

I ran git rebase upstream/master, reran the test again: no error.

can you run the rebase and push?

@Fabian1976
Copy link
Contributor Author

I have now. Is it becasue i worked in a seperate branch? (add_tmp_parameter) in stead of master?

@vinzent
Copy link
Contributor

vinzent commented Jan 20, 2017

I do not see the push. :-/

if you have the upstream remote (git remote | grep upstream):

commands:

git fetch upstream && 
git checkout  add_tmpdir_parameter &&
git rebase upstream/master &&
git push -f

(the push requires a -f to override the remote banch)

@Fabian1976
Copy link
Contributor Author

I didn't use the -f option. Now i did :)

Copy link
Contributor

@vinzent vinzent left a comment

Choose a reason for hiding this comment

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

seems the tests are failing in master too. so then this looks good to me.

@vinzent
Copy link
Contributor

vinzent commented Jan 20, 2017

there is an augeas problem with the rspec tests and the acceptance test do not actually run on travis altough they show green (#39)

I could get the acceptance test running with the docker/centos-7-x64 nodeset from modulesync_config. It ran successfull.

@vinzent
Copy link
Contributor

vinzent commented Jan 20, 2017

after #40 is merged, could you rebase and push again? the tests should go green then.

@vinzent
Copy link
Contributor

vinzent commented Feb 2, 2017

@Fabian1976 rebase possible?

@Fabian1976
Copy link
Contributor Author

Rebase done

@vinzent vinzent merged commit 33c004c into voxpupuli:master Feb 8, 2017
@vinzent
Copy link
Contributor

vinzent commented Feb 8, 2017

thank you @Fabian1976 !

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement New feature or request needs-rebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants