sml-rubber 0.9.9 → 0.9.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (72) hide show
  1. data/VERSION +1 -1
  2. data/generators/vulcanize/templates/apache/config/rubber/deploy-apache.rb +13 -7
  3. data/generators/vulcanize/templates/apache/config/rubber/role/{web → apache}/deflate.conf +0 -0
  4. data/generators/vulcanize/templates/apache/config/rubber/role/{web → apache}/expires.conf +0 -0
  5. data/generators/vulcanize/templates/apache/config/rubber/role/{web → apache}/headers.conf +0 -0
  6. data/generators/vulcanize/templates/apache/config/rubber/role/apache/monit-apache.conf +8 -0
  7. data/generators/vulcanize/templates/apache/config/rubber/role/apache/ports.conf +5 -0
  8. data/generators/vulcanize/templates/apache/config/rubber/role/{web → apache}/setenvif.conf +0 -0
  9. data/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-apache-vhost.conf +62 -0
  10. data/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-apache.auth +7 -0
  11. data/generators/vulcanize/templates/{nginx/config/rubber/role/web_tools/index.html → apache/config/rubber/role/web_tools/tools-index.html} +8 -1
  12. data/generators/vulcanize/templates/apache/config/rubber/rubber-apache.yml +4 -12
  13. data/generators/vulcanize/templates/base/config/deploy.rb +5 -34
  14. data/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb +4 -6
  15. data/generators/vulcanize/templates/base/config/rubber/rubber.yml +29 -3
  16. data/generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/role/haproxy/haproxy-mongrel.conf +23 -0
  17. data/generators/vulcanize/templates/{nginx/config/rubber/role/web/nginx.conf → complete_mongrel_mysql/config/rubber/role/nginx/nginx-mongrel.conf} +25 -45
  18. data/generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/rubber-complete.yml +41 -0
  19. data/generators/vulcanize/templates/{complete_mysql → complete_mongrel_mysql}/templates.yml +0 -0
  20. data/generators/vulcanize/templates/complete_passenger_mysql/config/rubber/role/haproxy/haproxy-passenger.conf +19 -0
  21. data/generators/vulcanize/templates/complete_passenger_mysql/config/rubber/rubber-complete.yml +40 -0
  22. data/generators/vulcanize/templates/complete_passenger_mysql/templates.yml +3 -1
  23. data/generators/vulcanize/templates/cruise/config/rubber/deploy-cruise.rb +8 -10
  24. data/generators/vulcanize/templates/cruise/config/rubber/role/web_tools/cruise-nginx.conf +1 -1
  25. data/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/haproxy-base.conf +26 -0
  26. data/generators/vulcanize/templates/haproxy/config/rubber/role/web_tools/haproxy-nginx.conf +1 -1
  27. data/generators/vulcanize/templates/haproxy/config/rubber/rubber-haproxy.yml +0 -5
  28. data/generators/vulcanize/templates/mongrel/config/rubber/deploy-mongrel.rb +7 -7
  29. data/generators/vulcanize/templates/mongrel/config/rubber/role/{app → mongrel}/mongrel_cluster.yml +4 -4
  30. data/generators/vulcanize/templates/mongrel/config/rubber/role/{app → mongrel}/monit-mongrel.conf +2 -2
  31. data/generators/vulcanize/templates/mongrel/config/rubber/rubber-mongrel.yml +2 -2
  32. data/generators/vulcanize/templates/monit/config/rubber/role/web_tools/monit-admin-nginx.conf +1 -1
  33. data/generators/vulcanize/templates/munin/config/rubber/deploy-munin.rb +17 -1
  34. data/generators/vulcanize/templates/munin/config/rubber/role/web_tools/munin-nginx.conf +1 -1
  35. data/generators/vulcanize/templates/munin/config/rubber/rubber-munin.yml +1 -1
  36. data/generators/vulcanize/templates/mysql/config/rubber/deploy-mysql.rb +14 -36
  37. data/generators/vulcanize/templates/mysql/config/rubber/role/db/monit-mysql.cnf +1 -1
  38. data/generators/vulcanize/templates/mysql/config/rubber/rubber-mysql.yml +8 -0
  39. data/generators/vulcanize/templates/mysql_cluster/config/rubber/deploy-mysql_cluster.rb +7 -7
  40. data/generators/vulcanize/templates/nginx/config/rubber/deploy-nginx.rb +6 -6
  41. data/generators/vulcanize/templates/nginx/config/rubber/role/{web → nginx}/crontab +0 -0
  42. data/generators/vulcanize/templates/nginx/config/rubber/role/{web → nginx}/monit-nginx.conf +0 -1
  43. data/generators/vulcanize/templates/nginx/config/rubber/role/nginx/nginx.conf +42 -0
  44. data/generators/vulcanize/templates/nginx/config/rubber/role/web_tools/nginx-tools.conf +43 -62
  45. data/generators/vulcanize/templates/nginx/config/rubber/role/web_tools/tools-index.html +30 -0
  46. data/generators/vulcanize/templates/nginx/config/rubber/role/web_tools/tools-nginx.auth +7 -0
  47. data/generators/vulcanize/templates/nginx/config/rubber/rubber-nginx.yml +3 -26
  48. data/generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb +13 -40
  49. data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf +6 -0
  50. data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf +47 -0
  51. data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger-apache-vhost.conf +46 -0
  52. data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf +10 -0
  53. data/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml +9 -11
  54. data/generators/vulcanize/templates/sphinx/config/rubber/deploy-sphinx.rb +1 -1
  55. data/lib/rubber/cloud/aws.rb +30 -0
  56. data/lib/rubber/instance.rb +53 -2
  57. data/lib/rubber/recipes/rubber.rb +7 -6
  58. data/lib/rubber/recipes/rubber/deploy.rb +22 -1
  59. data/lib/rubber/recipes/rubber/instances.rb +74 -24
  60. data/lib/rubber/recipes/rubber/load_balancers.rb +27 -0
  61. data/lib/rubber/recipes/rubber/security_groups.rb +5 -7
  62. data/lib/rubber/recipes/rubber/setup.rb +50 -14
  63. data/lib/rubber/recipes/rubber/static_ips.rb +7 -7
  64. data/lib/rubber/recipes/rubber/utils.rb +6 -7
  65. data/lib/rubber/recipes/rubber/volumes.rb +8 -8
  66. data/lib/rubber/util.rb +4 -0
  67. data/test/instance_test.rb +55 -0
  68. metadata +32 -18
  69. data/generators/vulcanize/templates/apache/config/rubber/role/web/vhost.conf +0 -27
  70. data/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/haproxy.conf +0 -44
  71. data/generators/vulcanize/templates/passenger/config/rubber/role/web/passenger.conf +0 -8
  72. data/generators/vulcanize/templates/passenger/config/rubber/role/web/vhost.conf +0 -29
@@ -1,27 +0,0 @@
1
- <%
2
- @path = "/etc/apache2/sites-available/#{rubber_env.app_name}"
3
- @post = "a2enmod rewrite && a2ensite #{rubber_env.app_name} && /etc/init.d/apache2 reload"
4
- %>
5
- <VirtualHost *:80>
6
- ServerName <%= rubber_env.domain %>
7
- ServerAlias <%= rubber_env.web_aliases.join(" ") %>
8
- DocumentRoot <%= RUBBER_ROOT + "/public" %>
9
-
10
- ErrorDocument 404 /404.html
11
- ErrorDocument 500 /500.html
12
-
13
- SetEnvIf User-Agent "^(.*MSIE.*)|(.*AppleWebKit.*)$" nokeepalive
14
-
15
- RailsEnv <%= RUBBER_ENV %>
16
- RailsAllowModRewrite on
17
-
18
- RewriteEngine On
19
- RewriteCond %{HTTP_HOST} ^<%= rubber_env.domain %>$
20
- RewriteRule ^(.*)$ http://www.<%= rubber_env.domain %>$1 [R,L]
21
-
22
- # Include <%= RUBBER_ROOT + "/public" %>/config/apache/rewrites.conf
23
-
24
- RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
25
- RewriteCond %{SCRIPT_FILENAME} !maintenance.html
26
- RewriteRule ^.*$ /system/maintenance.html [L]
27
- </VirtualHost>
@@ -1,44 +0,0 @@
1
- <%
2
- @path = "/etc/haproxy/haproxy.cfg"
3
- %>
4
- global
5
- log 127.0.0.1 local0 warning
6
- maxconn 1024
7
-
8
- defaults
9
- log global
10
- mode http
11
- retries 3
12
- balance roundrobin
13
- option abortonclose
14
- option redispatch
15
- contimeout 4000
16
- clitimeout 150000
17
- srvtimeout 30000
18
-
19
- listen mongrel_proxy 0.0.0.0:<%= rubber_env.haproxy_listen_port %>
20
- <%
21
- # Since we do "fair" load balancing to the mongrels, we don't want to share mongrels
22
- # between haproxy instances otherwise we still end up with requests getting queued behind
23
- # slow ones.
24
- app_hosts = rubber_instances.for_role('app').collect { |i| i.name }
25
- web_hosts = rubber_instances.for_role('web').collect { |i| i.name }
26
- ports = (rubber_env.appserver_base_port.to_i ... rubber_env.appserver_base_port.to_i + rubber_env.appserver_count.to_i).to_a
27
- host_count = web_hosts.size
28
- host_mod = web_hosts.sort.index(rubber_env.host) rescue 0
29
- ports = ports.find_all {|x| x % host_count == host_mod}
30
- %>
31
- <% app_hosts.each do |server| %>
32
- <% ports.each do |port| %>
33
- server <%= server %>_<%= port %> <%= server %>:<%= port %> maxconn 1 check
34
- <% end %>
35
- <% end %>
36
-
37
- # Admin interface for proxy stats
38
- listen admin 0.0.0.0:<%= rubber_env.haproxy_admin_port %>
39
- stats uri /haproxy
40
-
41
- # So monit can check on haproxy
42
- # simple response : 'OK'
43
- listen health_check 0.0.0.0:<%= rubber_env.haproxy_monitor_port %>
44
- mode health
@@ -1,8 +0,0 @@
1
- <%
2
- @path = '/etc/apache2/mods-available/passenger.conf'
3
- @post = 'cd /etc/apache2/mods-enabled && ln -fs ../mods-available/passenger.conf && /etc/init.d/apache2 restart'
4
- %>
5
- LoadModule passenger_module /usr/lib/ruby/gems/1.8/gems/passenger-2.2.4/ext/apache2/mod_passenger.so
6
- PassengerRoot /usr/lib/ruby/gems/1.8/gems/passenger-2.2.4
7
- PassengerRuby /opt/ruby-enterprise/bin/ruby
8
- PassengerUseGlobalQueue on
@@ -1,29 +0,0 @@
1
- <%
2
- @path = "/etc/apache2/sites-available/#{rubber_env.app_name}"
3
- @post = "a2enmod rewrite && a2ensite #{rubber_env.app_name} && /etc/init.d/apache2 reload"
4
- %>
5
- <VirtualHost *:80>
6
- ServerName <%= rubber_env.domain %>
7
- <%- if rubber_env.web_aliases -%>
8
- ServerAlias <%= rubber_env.web_aliases.join(" ") %>
9
- <%- end -%>
10
- DocumentRoot <%= RUBBER_ROOT + "/public" %>
11
-
12
- ErrorDocument 404 /404.html
13
- ErrorDocument 500 /500.html
14
-
15
- SetEnvIf User-Agent "^(.*MSIE.*)|(.*AppleWebKit.*)$" nokeepalive
16
-
17
- RailsEnv <%= RUBBER_ENV %>
18
- RailsAllowModRewrite on
19
-
20
- RewriteEngine On
21
- RewriteCond %{HTTP_HOST} ^<%= rubber_env.domain %>$
22
- RewriteRule ^(.*)$ http://www.<%= rubber_env.domain %>$1 [R,L]
23
-
24
- # Include <%= RUBBER_ROOT + "/public" %>/config/apache/rewrites.conf
25
-
26
- RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
27
- RewriteCond %{SCRIPT_FILENAME} !maintenance.html
28
- RewriteRule ^.*$ /system/maintenance.html [L]
29
- </VirtualHost>