Skip to content

Commit fbeae85

Browse files
Merge pull request #119 from envato/passenger-root-parameter
Allow PassengerRoot directory to be supplied
2 parents 6232a4b + 265ee19 commit fbeae85

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

manifests/master.pp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
$passenger_high_performance = on,
101101
$passenger_max_requests = 10000,
102102
$passenger_stat_throttle_rate = 30,
103+
$passenger_root = undef,
103104
$serialization_format = undef,
104105
$serialization_package = undef,
105106
) inherits puppet::params {
@@ -157,7 +158,7 @@
157158
passenger_high_performance => $passenger_high_performance,
158159
passenger_max_requests => $passenger_max_requests,
159160
passenger_stat_throttle_rate => $passenger_stat_throttle_rate,
160-
161+
passenger_root => $passenger_root,
161162
} ->
162163
Anchor['puppet::master::end']
163164

manifests/passenger.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
$passenger_high_performance = 'off',
5050
$passenger_max_requests = 0,
5151
$passenger_stat_throttle_rate = 10,
52+
$passenger_root,
5253
){
5354

5455
class { 'apache':
@@ -68,6 +69,7 @@
6869
passenger_high_performance => $passenger_high_performance,
6970
passenger_max_requests => $passenger_max_requests,
7071
passenger_stat_throttle_rate => $passenger_stat_throttle_rate,
72+
passenger_root => $passenger_root,
7173
}
7274

7375
class { 'apache::mod::ssl':

spec/classes/puppet_passenger_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
:passenger_high_performance => true,
1818
:passenger_max_requests => '1000',
1919
:passenger_stat_throttle_rate => '30',
20+
:passenger_root => nil,
2021
}
2122
end
2223
context 'on Debian' do
@@ -124,6 +125,7 @@
124125
:passenger_high_performance => true,
125126
:passenger_max_requests => '1000',
126127
:passenger_stat_throttle_rate => '30',
128+
:passenger_root => nil,
127129
}
128130
end
129131
it {

0 commit comments

Comments
 (0)