Support Passenger repo on Amazon Linux #1549
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
September 1, 2016 17:08
* master: (24 commits) Additional SLES fix for version fact Suse has prefork per default Support Apache 2.4 on SLES 12 (MODULES-3983) Update parallel_tests for ruby 2.0.0 (FM-5739) removes mocha stubbing Adding requirement for httpd package Do not set ssl_certs_dir on FreeBSD Notify Apache of new symlink Update modulesync_config [51f469d] Rename spec for apache::mod::disk_cache (puppetlabs#1509) Simplify MPM setup on FreeBSD (puppetlabs#1497) Add path to shibboleth lib Auto load Apache::Mod[slotmem_shm] and Apache::Mod[lbmethod_byrequests] with proxy_balancer on 2.4 Add passenger_nodejs + passenger_sticky_sessions + passenger_startup_file in which lint errors are fixed in which final touches are added in which failures for sles 11 are zero adds cond for apache versions on suse SuSE 11 test improvements Don't write empty servername for vhost to template ...
wilson208
reviewed
Nov 14, 2016
| if $::operatingsystem == 'Amazon' { | ||
| yumrepo { 'passenger': | ||
| ensure => 'present', | ||
| baseurl => 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch', |
There was a problem hiding this comment.
If I am not mistaken, isn't the only change in this PR hardcoding 6Server rather than using $releasever on Amazon? Would it be tidier to move the base_url out to a separate variable, rather than duplicate the entire yumrepo resource? e.g.
if $::operatingsystem == 'Amazon' {
$passenger_base_url = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch'
} else {
$passenger_base_url = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch'
}
|
Left some comments in the code @seefood, let me know your thoughts :) |
added 2 commits
November 14, 2016 14:17
into feature/AmazonLinux * 'master' of https://github.com/puppetlabs/puppetlabs-apache: proxypassmatch not supported on sles 10 apache (MODULES-3704) Update gemfile template to be identical remove mod_security tests for sles 10 adjusts mod package name for SLES 10 excludes dav_svn tests mocha version update for test hanging issue 1. Allow user to specify alternative package and library names from the default. If left undef, they remain the values set in params.pp. 2. Fix parameter alignment.
|
OK, should be better now. |
|
Halleluya! Just as we're getting rid of the AmaLin imagesin favor of CentOS... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No systemd on AmaLinux, so it should get the el6 repo.