rubber 2.2.4 → 2.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (39) hide show
  1. checksums.yaml +7 -0
  2. data/CHANGELOG +46 -0
  3. data/lib/rubber/commands/config.rb +4 -2
  4. data/lib/rubber/commands/vulcanize.rb +1 -1
  5. data/lib/rubber/dns/base.rb +4 -0
  6. data/lib/rubber/recipes/rubber.rb +3 -3
  7. data/lib/rubber/recipes/rubber/utils.rb +3 -1
  8. data/lib/rubber/version.rb +1 -1
  9. data/rubber.gemspec +1 -1
  10. data/templates/base/config/deploy.rb +1 -0
  11. data/templates/base/config/rubber/rubber-ruby.yml +1 -1
  12. data/templates/base/config/rubber/rubber.yml +1 -1
  13. data/templates/collectd/config/rubber/deploy-collectd.rb +6 -0
  14. data/templates/elasticsearch/config/rubber/deploy-elasticsearch.rb +1 -1
  15. data/templates/graphite/config/rubber/deploy-graphite.rb +20 -5
  16. data/templates/memcached/config/rubber/deploy-memcached.rb +15 -0
  17. data/templates/memcached/config/rubber/role/memcached/crontab +8 -0
  18. data/templates/memcached/config/rubber/role/memcached/memcached.conf +1 -1
  19. data/templates/memcached/config/rubber/rubber-memcached.yml +2 -0
  20. data/templates/mongodb/config/rubber/deploy-mongodb.rb +11 -2
  21. data/templates/mongodb/config/rubber/role/mongodb/crontab +8 -0
  22. data/templates/monit/config/rubber/deploy-monit.rb +8 -1
  23. data/templates/mysql/config/rubber/rubber-mysql.yml +1 -1
  24. data/templates/nginx/config/rubber/deploy-nginx.rb +8 -1
  25. data/templates/nginx/config/rubber/role/nginx/crontab +1 -1
  26. data/templates/nginx/config/rubber/role/nginx/nginx.conf +4 -4
  27. data/templates/nginx/config/rubber/rubber-nginx.yml +2 -0
  28. data/templates/passenger_nginx/config/rubber/role/passenger_nginx/application.conf +1 -1
  29. data/templates/passenger_nginx/config/rubber/role/passenger_nginx/crontab +1 -1
  30. data/templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf +3 -3
  31. data/templates/passenger_nginx/config/rubber/rubber-passenger_nginx.yml +3 -3
  32. data/templates/percona/config/rubber/rubber-percona.yml +1 -1
  33. data/templates/redis/config/rubber/deploy-redis.rb +1 -1
  34. data/templates/redis/config/rubber/role/redis/redis.conf +261 -141
  35. data/templates/redis/config/rubber/rubber-redis.yml +1 -1
  36. data/templates/torquebox/config/rubber/deploy-torquebox.rb +1 -1
  37. data/templates/unicorn/config/rubber/deploy-unicorn.rb +8 -1
  38. metadata +102 -151
  39. data/templates/graphite/config/rubber/role/graphite_server/graphite-collectd-ping.conf +0 -11
data/templates/redis/config/rubber/rubber-redis.yml CHANGED
@@ -1,4 +1,4 @@
1
- redis_server_version: 2.4.18
1
+ redis_server_version: 2.6.13
2
2
  redis_server_pid_file: /var/run/redis-server.pid
3
3
  redis_server_conf_file: /etc/redis.conf
4
4
  redis_server_log_file: /var/log/redis-server.log
data/templates/torquebox/config/rubber/deploy-torquebox.rb CHANGED
@@ -102,7 +102,7 @@ namespace :rubber do
102
102
  end
103
103
 
104
104
  task :start, :roles => :torquebox do
105
- rsudo "service torquebox status || service torquebox start"
105
+ rsudo "service torquebox start"
106
106
  end
107
107
 
108
108
  desc "Reloads the apache web server"
data/templates/unicorn/config/rubber/deploy-unicorn.rb CHANGED
@@ -29,7 +29,14 @@ namespace :rubber do
29
29
  task :reload, :roles => :unicorn do
30
30
  rsudo "if [ -f /var/run/unicorn.pid ]; then pid=`cat /var/run/unicorn.pid` && kill -USR2 $pid; else cd #{current_path} && bundle exec unicorn_rails -c #{current_path}/config/unicorn.rb -E #{Rubber.env} -D; fi"
31
31
  end
32
-
32
+
33
+ desc "Display status of the unicorn web server"
34
+ task :status, :roles => :unicorn do
35
+ # "service unicorn status" always returns "unicorn stop/waiting"
36
+ rsudo "ps -eopid,user,cmd | grep [u]nicorn || true"
37
+ rsudo "netstat -tupan | grep unicorn || true"
38
+ end
39
+
33
40
  end
34
41
 
35
42
  end
metadata CHANGED
@@ -1,227 +1,184 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubber
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.4
5
- prerelease:
4
+ version: 2.3.0
6
5
  platform: ruby
7
6
  authors:
8
7
  - Matt Conway
9
8
  - Kevin Menard
10
- autorequire:
9
+ autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2013-03-10 00:00:00.000000000 Z
12
+ date: 2013-05-11 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: capistrano
17
- version_requirements: !ruby/object:Gem::Requirement
18
- requirements:
19
- - - "~>"
20
- - !ruby/object:Gem::Version
21
- version: '2.12'
22
- none: false
23
16
  requirement: !ruby/object:Gem::Requirement
24
17
  requirements:
25
- - - "~>"
18
+ - - ~>
26
19
  - !ruby/object:Gem::Version
27
20
  version: '2.12'
28
- none: false
29
- prerelease: false
30
21
  type: :runtime
31
- - !ruby/object:Gem::Dependency
32
- name: net-ssh
22
+ prerelease: false
33
23
  version_requirements: !ruby/object:Gem::Requirement
34
24
  requirements:
35
- - - "~>"
25
+ - - ~>
36
26
  - !ruby/object:Gem::Version
37
- version: '2.6'
38
- none: false
27
+ version: '2.12'
28
+ - !ruby/object:Gem::Dependency
29
+ name: net-ssh
39
30
  requirement: !ruby/object:Gem::Requirement
40
31
  requirements:
41
- - - "~>"
32
+ - - ~>
42
33
  - !ruby/object:Gem::Version
43
34
  version: '2.6'
44
- none: false
45
- prerelease: false
46
35
  type: :runtime
47
- - !ruby/object:Gem::Dependency
48
- name: thor
36
+ prerelease: false
49
37
  version_requirements: !ruby/object:Gem::Requirement
50
38
  requirements:
51
- - - ">="
39
+ - - ~>
52
40
  - !ruby/object:Gem::Version
53
- version: !binary |-
54
- MA==
55
- none: false
41
+ version: '2.6'
42
+ - !ruby/object:Gem::Dependency
43
+ name: thor
56
44
  requirement: !ruby/object:Gem::Requirement
57
45
  requirements:
58
- - - ">="
46
+ - - '>='
59
47
  - !ruby/object:Gem::Version
60
- version: !binary |-
61
- MA==
62
- none: false
63
- prerelease: false
48
+ version: '0'
64
49
  type: :runtime
65
- - !ruby/object:Gem::Dependency
66
- name: clamp
50
+ prerelease: false
67
51
  version_requirements: !ruby/object:Gem::Requirement
68
52
  requirements:
69
- - - ">="
53
+ - - '>='
70
54
  - !ruby/object:Gem::Version
71
- version: !binary |-
72
- MA==
73
- none: false
55
+ version: '0'
56
+ - !ruby/object:Gem::Dependency
57
+ name: clamp
74
58
  requirement: !ruby/object:Gem::Requirement
75
59
  requirements:
76
- - - ">="
60
+ - - '>='
77
61
  - !ruby/object:Gem::Version
78
- version: !binary |-
79
- MA==
80
- none: false
81
- prerelease: false
62
+ version: '0'
82
63
  type: :runtime
83
- - !ruby/object:Gem::Dependency
84
- name: open4
64
+ prerelease: false
85
65
  version_requirements: !ruby/object:Gem::Requirement
86
66
  requirements:
87
- - - ">="
67
+ - - '>='
88
68
  - !ruby/object:Gem::Version
89
- version: !binary |-
90
- MA==
91
- none: false
69
+ version: '0'
70
+ - !ruby/object:Gem::Dependency
71
+ name: open4
92
72
  requirement: !ruby/object:Gem::Requirement
93
73
  requirements:
94
- - - ">="
74
+ - - '>='
95
75
  - !ruby/object:Gem::Version
96
- version: !binary |-
97
- MA==
98
- none: false
99
- prerelease: false
76
+ version: '0'
100
77
  type: :runtime
101
- - !ruby/object:Gem::Dependency
102
- name: fog
78
+ prerelease: false
103
79
  version_requirements: !ruby/object:Gem::Requirement
104
80
  requirements:
105
- - - "~>"
81
+ - - '>='
106
82
  - !ruby/object:Gem::Version
107
- version: '1.6'
108
- none: false
83
+ version: '0'
84
+ - !ruby/object:Gem::Dependency
85
+ name: fog
109
86
  requirement: !ruby/object:Gem::Requirement
110
87
  requirements:
111
- - - "~>"
88
+ - - ~>
112
89
  - !ruby/object:Gem::Version
113
90
  version: '1.6'
114
- none: false
115
- prerelease: false
116
91
  type: :runtime
117
- - !ruby/object:Gem::Dependency
118
- name: json
92
+ prerelease: false
119
93
  version_requirements: !ruby/object:Gem::Requirement
120
94
  requirements:
121
- - - ">="
95
+ - - ~>
122
96
  - !ruby/object:Gem::Version
123
- version: !binary |-
124
- MA==
125
- none: false
97
+ version: '1.6'
98
+ - !ruby/object:Gem::Dependency
99
+ name: json
126
100
  requirement: !ruby/object:Gem::Requirement
127
101
  requirements:
128
- - - ">="
102
+ - - '>='
129
103
  - !ruby/object:Gem::Version
130
- version: !binary |-
131
- MA==
132
- none: false
133
- prerelease: false
104
+ version: '0'
134
105
  type: :runtime
135
- - !ruby/object:Gem::Dependency
136
- name: rake
106
+ prerelease: false
137
107
  version_requirements: !ruby/object:Gem::Requirement
138
108
  requirements:
139
- - - ">="
109
+ - - '>='
140
110
  - !ruby/object:Gem::Version
141
- version: !binary |-
142
- MA==
143
- none: false
111
+ version: '0'
112
+ - !ruby/object:Gem::Dependency
113
+ name: rake
144
114
  requirement: !ruby/object:Gem::Requirement
145
115
  requirements:
146
- - - ">="
116
+ - - '>='
147
117
  - !ruby/object:Gem::Version
148
- version: !binary |-
149
- MA==
150
- none: false
151
- prerelease: false
118
+ version: '0'
152
119
  type: :development
153
- - !ruby/object:Gem::Dependency
154
- name: test-unit
120
+ prerelease: false
155
121
  version_requirements: !ruby/object:Gem::Requirement
156
122
  requirements:
157
- - - ">="
123
+ - - '>='
158
124
  - !ruby/object:Gem::Version
159
- version: !binary |-
160
- MA==
161
- none: false
125
+ version: '0'
126
+ - !ruby/object:Gem::Dependency
127
+ name: test-unit
162
128
  requirement: !ruby/object:Gem::Requirement
163
129
  requirements:
164
- - - ">="
130
+ - - '>='
165
131
  - !ruby/object:Gem::Version
166
- version: !binary |-
167
- MA==
168
- none: false
169
- prerelease: false
132
+ version: '0'
170
133
  type: :development
171
- - !ruby/object:Gem::Dependency
172
- name: shoulda-context
134
+ prerelease: false
173
135
  version_requirements: !ruby/object:Gem::Requirement
174
136
  requirements:
175
- - - ">="
137
+ - - '>='
176
138
  - !ruby/object:Gem::Version
177
- version: !binary |-
178
- MA==
179
- none: false
139
+ version: '0'
140
+ - !ruby/object:Gem::Dependency
141
+ name: shoulda-context
180
142
  requirement: !ruby/object:Gem::Requirement
181
143
  requirements:
182
- - - ">="
144
+ - - '>='
183
145
  - !ruby/object:Gem::Version
184
- version: !binary |-
185
- MA==
186
- none: false
187
- prerelease: false
146
+ version: '0'
188
147
  type: :development
189
- - !ruby/object:Gem::Dependency
190
- name: mocha
148
+ prerelease: false
191
149
  version_requirements: !ruby/object:Gem::Requirement
192
150
  requirements:
193
- - - ">="
151
+ - - '>='
194
152
  - !ruby/object:Gem::Version
195
- version: !binary |-
196
- MA==
197
- none: false
153
+ version: '0'
154
+ - !ruby/object:Gem::Dependency
155
+ name: mocha
198
156
  requirement: !ruby/object:Gem::Requirement
199
157
  requirements:
200
- - - ">="
158
+ - - '>='
201
159
  - !ruby/object:Gem::Version
202
- version: !binary |-
203
- MA==
204
- none: false
205
- prerelease: false
160
+ version: '0'
206
161
  type: :development
207
- - !ruby/object:Gem::Dependency
208
- name: awesome_print
162
+ prerelease: false
209
163
  version_requirements: !ruby/object:Gem::Requirement
210
164
  requirements:
211
- - - ">="
165
+ - - '>='
212
166
  - !ruby/object:Gem::Version
213
- version: !binary |-
214
- MA==
215
- none: false
167
+ version: '0'
168
+ - !ruby/object:Gem::Dependency
169
+ name: awesome_print
216
170
  requirement: !ruby/object:Gem::Requirement
217
171
  requirements:
218
- - - ">="
172
+ - - '>='
219
173
  - !ruby/object:Gem::Version
220
- version: !binary |-
221
- MA==
222
- none: false
223
- prerelease: false
174
+ version: '0'
224
175
  type: :development
176
+ prerelease: false
177
+ version_requirements: !ruby/object:Gem::Requirement
178
+ requirements:
179
+ - - '>='
180
+ - !ruby/object:Gem::Version
181
+ version: '0'
225
182
  description: |2
226
183
  The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to
227
184
  Amazon's Elastic Compute Cloud (EC2). Like capistrano, rubber is role based, so you can define a set
@@ -237,8 +194,8 @@ executables:
237
194
  extensions: []
238
195
  extra_rdoc_files: []
239
196
  files:
240
- - ".gitignore"
241
- - ".travis.yml"
197
+ - .gitignore
198
+ - .travis.yml
242
199
  - CHANGELOG
243
200
  - Gemfile
244
201
  - LICENSE
@@ -389,7 +346,6 @@ files:
389
346
  - templates/graphite/config/rubber/deploy-graphite.rb
390
347
  - templates/graphite/config/rubber/role/collectd/graphite-collectd.conf
391
348
  - templates/graphite/config/rubber/role/graphite_server/carbon.conf
392
- - templates/graphite/config/rubber/role/graphite_server/graphite-collectd-ping.conf
393
349
  - templates/graphite/config/rubber/role/graphite_server/graphite_server-upstart.conf
394
350
  - templates/graphite/config/rubber/role/graphite_server/monit-graphite_server.conf
395
351
  - templates/graphite/config/rubber/role/graphite_server/storage-schemas.conf
@@ -442,6 +398,8 @@ files:
442
398
  - templates/jetty/templates.yml
443
399
  - templates/memcached/config/memcached.yml
444
400
  - templates/memcached/config/rubber/common/memcached.yml
401
+ - templates/memcached/config/rubber/deploy-memcached.rb
402
+ - templates/memcached/config/rubber/role/memcached/crontab
445
403
  - templates/memcached/config/rubber/role/memcached/memcached.conf
446
404
  - templates/memcached/config/rubber/rubber-memcached.yml
447
405
  - templates/memcached/templates.yml
@@ -450,6 +408,7 @@ files:
450
408
  - templates/minimal_passenger_nginx/config/rubber/rubber-complete.yml
451
409
  - templates/minimal_passenger_nginx/templates.yml
452
410
  - templates/mongodb/config/rubber/deploy-mongodb.rb
411
+ - templates/mongodb/config/rubber/role/mongodb/crontab
453
412
  - templates/mongodb/config/rubber/role/mongodb/mongodb-defaults.conf
454
413
  - templates/mongodb/config/rubber/role/mongodb/mongodb.conf
455
414
  - templates/mongodb/config/rubber/rubber-mongodb.yml
@@ -684,36 +643,28 @@ files:
684
643
  - test/test-rails-template.rb
685
644
  - test/test_helper.rb
686
645
  - test/util_test.rb
687
- homepage: http://github.com/wr0ngway/rubber
646
+ homepage: https://github.com/rubber/rubber
688
647
  licenses: []
689
- post_install_message:
648
+ metadata: {}
649
+ post_install_message:
690
650
  rdoc_options: []
691
651
  require_paths:
692
652
  - lib
693
653
  required_ruby_version: !ruby/object:Gem::Requirement
694
654
  requirements:
695
- - - ">="
655
+ - - '>='
696
656
  - !ruby/object:Gem::Version
697
- segments:
698
- - 0
699
- version: !binary |-
700
- MA==
701
- hash: 2
702
- none: false
657
+ version: '0'
703
658
  required_rubygems_version: !ruby/object:Gem::Requirement
704
659
  requirements:
705
- - - ">="
660
+ - - '>='
706
661
  - !ruby/object:Gem::Version
707
- segments:
708
- - 0
709
- version: !binary |-
710
- MA==
711
- hash: 2
712
- none: false
662
+ version: '0'
713
663
  requirements: []
714
664
  rubyforge_project: rubber
715
- rubygems_version: 1.8.24
716
- signing_key:
717
- specification_version: 3
718
- summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)
665
+ rubygems_version: 2.0.0
666
+ signing_key:
667
+ specification_version: 4
668
+ summary: A capistrano plugin for managing multi-instance deployments to the cloud
669
+ (ec2)
719
670
  test_files: []
data/templates/graphite/config/rubber/role/graphite_server/graphite-collectd-ping.conf DELETED
@@ -1,11 +0,0 @@
1
- <%
2
- @path = '/etc/collectd/conf.d/graphite-ping.conf'
3
- %>
4
-
5
- LoadPlugin ping
6
-
7
- <Plugin "ping">
8
- <% rubber_instances.each do |ic| %>
9
- Host "<%= ic.full_name %>"
10
- <% end %>
11
- </Plugin>