freighthop 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/data/common.json CHANGED
@@ -4,5 +4,5 @@
4
4
  "freighthop::packages": ["build-essential", "git"],
5
5
  "freighthop::languages": [],
6
6
  "freighthop::web::apache::passenger_app_env": "development",
7
- "freighthop::web::apache::passenger_buffer_upload": true
7
+ "freighthop::web::apache::passenger_config": []
8
8
  }
@@ -1,3 +1,3 @@
1
1
  module Freighthop
2
- VERSION = "0.3.2"
2
+ VERSION = "0.3.3"
3
3
  end
@@ -4,7 +4,7 @@ class freighthop::web::apache(
4
4
  $ssl_key_path,
5
5
  $server_name,
6
6
  $passenger_app_env,
7
- $passenger_buffer_upload,
7
+ $passenger_config,
8
8
  $port = $freighthop::params::http_port,
9
9
  $ssl_port = $freighthop::params::https_port,
10
10
  $upstream_port = $freighthop::params::upstream_port,
@@ -13,9 +13,12 @@ class freighthop::web::apache(
13
13
  $web_root = $freighthop::params::web_root,
14
14
  $passenger = $freighthop::params::passenger,
15
15
  ) {
16
+ validate_array($passenger_config)
17
+
16
18
  class { '::apache':
17
19
  default_vhost => false,
18
20
  }
21
+
19
22
  apache::vhost { "${server_name} non-ssl":
20
23
  servername => $server_name,
21
24
  docroot => $web_root,
@@ -13,12 +13,10 @@
13
13
  # Set the rack/rails environment
14
14
  PassengerAppEnv <%= @passenger_app_env %>
15
15
 
16
- # Whether or not to buffer file uploads before passing them through to passenger.
17
- # Allows application to deal in streams for large uploads.
18
- # Requires Passenger 4.0.26 or higher; defaults to On
19
- <% if @passenger_buffer_upload -%>
20
- PassengerBufferUpload On
21
- <% else -%>
22
- PassengerBufferUpload Off
16
+ <% unless @passenger_config.empty? -%>
17
+ # Additional lines provided by Freighthop user
18
+ <% @passenger_config.each do |line| -%>
19
+ <%= line %>
20
+ <% end -%>
23
21
  <% end -%>
24
22
  </IfModule>
@@ -4,7 +4,7 @@ class freighthop::web::apache(
4
4
  $ssl_key_path,
5
5
  $server_name,
6
6
  $passenger_app_env,
7
- $passenger_buffer_upload,
7
+ $passenger_config,
8
8
  $port = $freighthop::params::http_port,
9
9
  $ssl_port = $freighthop::params::https_port,
10
10
  $upstream_port = $freighthop::params::upstream_port,
@@ -13,9 +13,12 @@ class freighthop::web::apache(
13
13
  $web_root = $freighthop::params::web_root,
14
14
  $passenger = $freighthop::params::passenger,
15
15
  ) {
16
+ validate_array($passenger_config)
17
+
16
18
  class { '::apache':
17
19
  default_vhost => false,
18
20
  }
21
+
19
22
  apache::vhost { "${server_name} non-ssl":
20
23
  servername => $server_name,
21
24
  docroot => $web_root,
@@ -13,12 +13,10 @@
13
13
  # Set the rack/rails environment
14
14
  PassengerAppEnv <%= @passenger_app_env %>
15
15
 
16
- # Whether or not to buffer file uploads before passing them through to passenger.
17
- # Allows application to deal in streams for large uploads.
18
- # Requires Passenger 4.0.26 or higher; defaults to On
19
- <% if @passenger_buffer_upload -%>
20
- PassengerBufferUpload On
21
- <% else -%>
22
- PassengerBufferUpload Off
16
+ <% unless @passenger_config.empty? -%>
17
+ # Additional lines provided by Freighthop user
18
+ <% @passenger_config.each do |line| -%>
19
+ <%= line %>
20
+ <% end -%>
23
21
  <% end -%>
24
22
  </IfModule>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: freighthop
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-01-16 00:00:00.000000000 Z
12
+ date: 2014-01-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler