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

fixing amazon default settings #155

Merged
merged 6 commits into from
Jul 30, 2015
Merged

fixing amazon default settings #155

merged 6 commits into from
Jul 30, 2015

Conversation

webratz
Copy link
Contributor

@webratz webratz commented Jul 28, 2015

Amazon LInux (at least on Version 2015.03) reports its own osfamily as RedHat therefore the old code causes the manifest to fail.
This PR fixes the detection.

@juniorsysadmin
Copy link
Member

Good catch. Perhaps leave the previous code in there (with a comment explaining that this is for older versions of Amazon Linux (<2015.03)). Also, if you are able to, can you add the relevant unit tests as well?

@webratz
Copy link
Contributor Author

webratz commented Jul 29, 2015

readded the test case, fixed also nodesource rpm for amazon linux.
updated the tests which work now on my local machine

@igalic
Copy link
Contributor

igalic commented Jul 29, 2015

@webratz would you mind squashing the failing tests, please?

Andreas Sieferlinger added 2 commits July 30, 2015 09:13
readding this case for older facter and Amazon Linux Versions

fixing repo for newer amazon linux versions

adding tests for Amazon Linux 2015.03
* 'master' of github.com:webratz/puppet-nodejs:
  adding tests for Amazon Linux 2015.03
  fixing repo for newer amazon linux versions
  readding this case for older facter and Amazon Linux Versions
  fixing amazon default settings
@webratz
Copy link
Contributor Author

webratz commented Jul 30, 2015

squashed alltogether into first commit

igalic added a commit that referenced this pull request Jul 30, 2015
fixing amazon default settings
@igalic igalic merged commit b8ce263 into voxpupuli:master Jul 30, 2015
@igalic
Copy link
Contributor

igalic commented Jul 30, 2015

duh.
that was a bit too quickly fired. :(

that's neither squashed nor… uhm…i don't know what happned there.
why is git?

@webratz
Copy link
Contributor Author

webratz commented Jul 30, 2015

that looks indeed weird. i don't know how it happened but i guess we can't revert it easily

@igalic
Copy link
Contributor

igalic commented Jul 30, 2015

@webratz no worries.
next time, do it like so: puppetlabs/puppetlabs-apache#1167 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants