Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #37 from sgp/master

A couple of CentOS changes, along with a change for old-ass versions of passenger
  • Loading branch information...
commit 837c57e5d608e2cc5b7c29875eff4e2c73b3b772 2 parents 0bb2ce3 + c93a08d
@blt04 blt04 authored
View
9 manifests/dependencies/centos.pp
@@ -1,12 +1,19 @@
class rvm::dependencies::centos {
+ case $operatingsystemrelease {
+ /^6\..*/: {
+ if ! defined(Package['libcurl-devel']) { package { 'libcurl-devel': ensure => installed } }
+ }
+ default: {
+ if ! defined(Package['curl-devel']) { package { 'curl-devel': ensure => installed } }
+ }
+ }
if ! defined(Package['which']) { package { 'which': ensure => installed } }
if ! defined(Package['gcc']) { package { 'gcc': ensure => installed } }
if ! defined(Package['gcc-c++']) { package { 'gcc-c++': ensure => installed } }
if ! defined(Package['make']) { package { 'make': ensure => installed } }
if ! defined(Package['gettext-devel']) { package { 'gettext-devel': ensure => installed } }
if ! defined(Package['expat-devel']) { package { 'expat-devel': ensure => installed } }
- if ! defined(Package['curl-devel']) { package { 'curl-devel': ensure => installed } }
if ! defined(Package['zlib-devel']) { package { 'zlib-devel': ensure => installed } }
if ! defined(Package['openssl-devel']) { package { 'openssl-devel': ensure => installed } }
if ! defined(Package['perl']) { package { 'perl': ensure => installed } }
View
4 templates/passenger-apache-centos.conf.erb
@@ -5,7 +5,9 @@ LoadModule passenger_module <%= gempath %>/passenger-<%= version %>/ext/apache2/
PassengerRuby <%= rvm_prefix %>rvm/wrappers/<%= ruby_version %>/ruby
PassengerMaxPoolSize <%= maxpoolsize %>
PassengerPoolIdleTime <%= poolidletime %>
- PassengerMinInstances <%= mininstances %>
PassengerMaxInstancesPerApp <%= maxinstancesperapp %>
+<% if version >= '3.0.0' %>
+ PassengerMinInstances <%= mininstances %>
PassengerSpawnMethod <%= spawnmethod %>
+<% end %>
</IfModule>
Please sign in to comment.
Something went wrong with that request. Please try again.