capper 0.9.21 → 0.9.22
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/capper/base.rb +1 -5
- data/lib/capper/monit.rb +4 -4
- data/lib/capper/templates/maintenance.html.erb +2 -2
- data/lib/capper/utils/templates.rb +1 -3
- data/lib/capper/version.rb +1 -1
- metadata +10 -10
data/lib/capper/base.rb
CHANGED
@@ -437,13 +437,9 @@ namespace :deploy do
|
|
437
437
|
RewriteRule ^.*$ - [redirect=503,last]
|
438
438
|
EOHTACCESS
|
439
439
|
|
440
|
-
reason = ENV['REASON']
|
441
|
-
deadline = ENV['UNTIL']
|
442
|
-
|
443
440
|
upload_template_file("maintenance.html",
|
444
441
|
"#{shared_path}/system/#{maintenance_basename}.html",
|
445
|
-
:mode => 0644
|
446
|
-
:binding => binding)
|
442
|
+
:mode => 0644)
|
447
443
|
end
|
448
444
|
|
449
445
|
desc <<-DESC
|
data/lib/capper/monit.rb
CHANGED
@@ -10,8 +10,8 @@ namespace :monit do
|
|
10
10
|
servers = find_servers
|
11
11
|
|
12
12
|
upload_template(monitrc, :mode => "0644") do |server|
|
13
|
-
configs.
|
14
|
-
roles =
|
13
|
+
configs.select do |name, config|
|
14
|
+
roles = config[:options][:roles]
|
15
15
|
if roles.nil?
|
16
16
|
true
|
17
17
|
else
|
@@ -19,8 +19,8 @@ namespace :monit do
|
|
19
19
|
self.roles[r.to_sym].include?(server)
|
20
20
|
end.any?
|
21
21
|
end
|
22
|
-
end.map do |name|
|
23
|
-
"# #{name}\n#{
|
22
|
+
end.map do |name, config|
|
23
|
+
"# #{name}\n#{config[:body]}"
|
24
24
|
end.join("\n\n")
|
25
25
|
end
|
26
26
|
end
|
@@ -38,11 +38,11 @@
|
|
38
38
|
<div class="DialogBody" style="text-align: center;">
|
39
39
|
<div style="text-align: center; width: 200px; margin: 0 auto;">
|
40
40
|
<p style="color: red; font-size: 16px; line-height: 20px;">
|
41
|
-
The system is down for <%=
|
41
|
+
The system is down for <%= ENV['REASON'] ? ENV['REASON'] : "maintenance" %>
|
42
42
|
as of <%= Time.now.strftime("%H:%M %Z") %>.
|
43
43
|
</p>
|
44
44
|
<p style="color: #666;">
|
45
|
-
It'll be back <%=
|
45
|
+
It'll be back <%= ENV['UNTIL'] ? ENV['UNTIL'] : "shortly" %>.
|
46
46
|
</p>
|
47
47
|
</div>
|
48
48
|
</div>
|
@@ -25,8 +25,6 @@ module Capper
|
|
25
25
|
end
|
26
26
|
|
27
27
|
def upload_template(path, options={})
|
28
|
-
bnd = options.delete(:binding) || binding
|
29
|
-
|
30
28
|
if task = current_task
|
31
29
|
servers = find_servers_for_task(task, options)
|
32
30
|
else
|
@@ -39,7 +37,7 @@ module Capper
|
|
39
37
|
|
40
38
|
servers.each do |server|
|
41
39
|
erb = Erubis::Eruby.new(yield server)
|
42
|
-
result = erb.result(
|
40
|
+
result = erb.result(binding)
|
43
41
|
put(result, path, options.merge!(:hosts => server))
|
44
42
|
end
|
45
43
|
end
|
data/lib/capper/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: capper
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.22
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-06-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: erubis
|
16
|
-
requirement: &
|
16
|
+
requirement: &3929400 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *3929400
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: capistrano
|
27
|
-
requirement: &
|
27
|
+
requirement: &3926180 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 2.9.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *3926180
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: capistrano_colors
|
38
|
-
requirement: &
|
38
|
+
requirement: &3922980 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 0.5.5
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *3922980
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: rvm-capistrano
|
49
|
-
requirement: &
|
49
|
+
requirement: &3938120 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,7 +54,7 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *3938120
|
58
58
|
description: Capper is a collection of opinionated Capistrano recipes
|
59
59
|
email:
|
60
60
|
- bb@xnull.de
|