le1t0-deprec 2.1.6.025 → 2.1.6.026
Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG
CHANGED
@@ -25,7 +25,15 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
25
25
|
set :passenger_rails_autodetect, 'on'
|
26
26
|
set :passenger_rails_spawn_method, 'smart' # smart | conservative
|
27
27
|
set :passenger_version, '2.2.11'
|
28
|
-
set :passenger_server_aliases, [ ]
|
28
|
+
set :passenger_server_aliases, [ ] # defaults to assets0-3.DOMAIN if nil, outputs no ServerAlias
|
29
|
+
|
30
|
+
set :passenger_apache_logging_config, nil # set to a string to override default logging config
|
31
|
+
set :passenger_rails_3, false
|
32
|
+
set :passenger_apache_deflate_html, false
|
33
|
+
set :passenger_apache_rewrite_config, nil # set to a string to override default rewrite config
|
34
|
+
set :passenger_apache_extra_config, nil # set this to a string to define extra apache options, not covered by the above
|
35
|
+
set :passenger_app_root, nil # set to a string to set an explicit path, set to false to disable the setting,
|
36
|
+
# defaults to parent dir of :passenger_document_root
|
29
37
|
|
30
38
|
desc "Install passenger"
|
31
39
|
task :install, :roles => :app do
|
@@ -8,7 +8,7 @@ global
|
|
8
8
|
user <%= haproxy_user %>
|
9
9
|
group <%= haproxy_group %>
|
10
10
|
<% haproxy_global_options.each do |key, values| [values].flatten.each do |value| %>
|
11
|
-
<%= key %> <%= value %>
|
11
|
+
<%= key %><% if value && value != true %> <%= value %><% end %>
|
12
12
|
<% end end %>
|
13
13
|
|
14
14
|
defaults
|
@@ -17,7 +17,7 @@ defaults
|
|
17
17
|
stats <%= haproxy_default_options[:stats_auth] %>
|
18
18
|
<% end %>
|
19
19
|
<% (haproxy_default_options[:options] || {}).each do |key, values| [values].flatten.each do |value| %>
|
20
|
-
<%= key %> <%= value %>
|
20
|
+
<%= key %><% if value && value != true %> <%= value %><% end %>
|
21
21
|
<% end end %>
|
22
22
|
|
23
23
|
<% haproxy_instances.each_with_index do |instance_ipport, i| %>
|
@@ -32,6 +32,6 @@ listen <%= instance[:name] || "no_name_defined_#{i+1}" %> <%= ipport %>
|
|
32
32
|
stats <%= instance[:stats_auth] %>
|
33
33
|
<% end %>
|
34
34
|
<% (instance[:servers] || {}).each do |key, value| %>
|
35
|
-
<%= key %> <%= value %>
|
35
|
+
<%= key %><% if value && value != true %> <%= value %><% end %>
|
36
36
|
<% end %>
|
37
37
|
<% end %>
|
@@ -2,28 +2,55 @@
|
|
2
2
|
<IfModule passenger_module>
|
3
3
|
<VirtualHost *:80>
|
4
4
|
ServerName <%= domain %>
|
5
|
-
|
6
|
-
|
7
|
-
|
5
|
+
<% unless passenger_server_aliases.nil? %>
|
6
|
+
<%- passenger_server_aliases.each do |server_alias| -%>
|
7
|
+
ServerAlias <%= server_alias %>
|
8
|
+
<%- end %>
|
9
|
+
<% else %>
|
10
|
+
<%- 4.times do |counter| -%>
|
11
|
+
ServerAlias <%= domain.sub(/.*?\./, "assets#{counter}.") %>
|
12
|
+
<%- end %>
|
13
|
+
<% end %>
|
14
|
+
|
8
15
|
DocumentRoot "<%= passenger_document_root %>"
|
16
|
+
<% unless passenger_app_root == false %>
|
17
|
+
PassengerAppRoot "<%= passenger_app_root || File.dirname(passenger_document_root) %>"
|
18
|
+
<% end %>
|
19
|
+
|
20
|
+
<% if passenger_apache_logging_config %>
|
21
|
+
<%= passenger_apache_logging_config %>
|
22
|
+
<% else %>
|
9
23
|
CustomLog <%= apache_log_dir %>/<%= application %>-access.log combined
|
10
24
|
ErrorLog <%= apache_log_dir %>/<%= application %>-error.log
|
25
|
+
<% end %>
|
11
26
|
|
12
|
-
|
27
|
+
<% if passenger_rails_3 %>
|
13
28
|
RackEnv <%= rails_env %>
|
14
|
-
|
15
|
-
|
16
|
-
|
29
|
+
<% else %>
|
30
|
+
RailsEnv <%= rails_env %>
|
31
|
+
<% end %>
|
32
|
+
|
33
|
+
<% if passenger_apache_rewrite_config %>
|
34
|
+
<%= passenger_apache_rewrite_config %>
|
35
|
+
<% else %>
|
17
36
|
RewriteEngine On
|
18
37
|
RewriteCond %{REQUEST_URI} !\.(css|jpg|png|gif)$
|
19
|
-
# allow requests to server-status and server-info, might be needed if you use monitoring services like fiveruns
|
20
38
|
RewriteCond %{REQUEST_URI} !server-(status|info)/?$
|
21
39
|
RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
|
22
40
|
RewriteCond %{SCRIPT_FILENAME} !maintenance.html
|
23
41
|
RewriteRule ^.*$ /system/maintenance.html [L]
|
42
|
+
<% end %>
|
43
|
+
|
44
|
+
<% if passenger_apache_extra_config %>
|
45
|
+
<%= passenger_apache_extra_config %>
|
46
|
+
<% end %>
|
47
|
+
|
24
48
|
<Directory "<%= passenger_document_root %>">
|
25
49
|
Order allow,deny
|
26
50
|
Allow from all
|
51
|
+
<% if passenger_apache_deflate_html %>
|
52
|
+
AddOutputFilterByType DEFLATE text/html
|
53
|
+
<% end %>
|
27
54
|
</Directory>
|
28
55
|
</VirtualHost>
|
29
56
|
</IfModule>
|
metadata
CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
|
|
6
6
|
- 2
|
7
7
|
- 1
|
8
8
|
- 6
|
9
|
-
-
|
10
|
-
version: 2.1.6.
|
9
|
+
- 26
|
10
|
+
version: 2.1.6.026
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Le1t0
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-07-
|
18
|
+
date: 2010-07-19 00:00:00 +02:00
|
19
19
|
default_executable: depify
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|