sml-rubber 0.9.9 → 0.9.10

data/generators/vulcanize/templates/mysql/config/rubber/role/db/monit-mysql.cnf

@@ -4,7 +4,7 @@
 
 check process mysql with pidfile /var/run/mysqld/mysqld.pid
    group mysql-<%= RUBBER_ENV %>
-   start program = "/etc/init.d/mysql start"
+   start program = "/etc/init.d/mysql restart"
    stop program = "/etc/init.d/mysql stop"
    if failed host 127.0.0.1 port 3306 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

data/generators/vulcanize/templates/mysql/config/rubber/rubber-mysql.yml

@@ -23,6 +23,14 @@ db_root_dir: /mnt/mysql
 db_data_dir: "#{db_root_dir}/data"
 db_log_dir: "#{db_root_dir}/log"
 
+# Capistrano needs db:primary role for migrate to work,
+# so we might as well just make consistent across the board
+role_dependencies:
+  mysql_master: [db:primary=true]
+  mysql_slave: [db]
+  db:primary=true: [mysql_master]
+  db: [mysql_slave]
+
 packages: [mysql-client, libmysql-ruby]
 
 roles:

data/generators/vulcanize/templates/mysql_cluster/config/rubber/deploy-mysql_cluster.rb

@@ -9,17 +9,17 @@ namespace :rubber do
       
     # Capistrano needs db:primary role for migrate to work
     task :set_db_role do
-      sql_instances = rubber_cfg.instance.for_role("mysql_sql")
+      sql_instances = rubber_instances.for_role("mysql_sql")
       sql_instances.each do |instance|
         if ! instance.role_names.find {|n| n == 'db'}
           role = Rubber::Configuration::RoleItem.new('db')
-          primary_exists = rubber_cfg.instance.for_role("db", "primary" => true).size > 0
+          primary_exists = rubber_instances.for_role("db", "primary" => true).size > 0
           role.options["primary"] = true  unless primary_exists
           instance.roles << role
         end
       end
-      rubber_cfg.instance.save()
-      load_roles() unless rubber_cfg.environment.bind().disable_auto_roles
+      rubber_instances.save()
+      load_roles() unless rubber_env.disable_auto_roles
     end
     
     before "rubber:install_packages", "rubber:mysql_cluster:install"
@@ -56,7 +56,7 @@ namespace :rubber do
       # Conditionaly bootstrap for each node/role only if that node has not
       # been boostrapped for that role before
       
-      rubber_cfg.instance.for_role("mysql_mgm").each do |ic|
+      rubber_instances.for_role("mysql_mgm").each do |ic|
         task_name = "_bootstrap_mysql_mgm_#{ic.full_name}".to_sym()
         task task_name, :hosts => ic.full_name do
           exists = capture("if grep -c rubber.*mysql_mgm /etc/mysql/ndb_mgmd.cnf &> /dev/null; then echo exists; fi")
@@ -68,7 +68,7 @@ namespace :rubber do
         send task_name
       end
     
-      rubber_cfg.instance.for_role("mysql_data").each do |ic|
+      rubber_instances.for_role("mysql_data").each do |ic|
         task_name = "_bootstrap_mysql_data_#{ic.full_name}".to_sym()
         task task_name, :hosts => ic.full_name do
           exists = capture("if grep -c rubber.*mysql_data /etc/mysql/my.cnf &> /dev/null; then echo exists; fi")
@@ -80,7 +80,7 @@ namespace :rubber do
         send task_name
       end
       
-      rubber_cfg.instance.for_role("mysql_sql").each do |ic|
+      rubber_instances.for_role("mysql_sql").each do |ic|
         task_name = "_bootstrap_mysql_sql_#{ic.full_name}".to_sym()
         task task_name, :hosts => ic.full_name do
           exists = capture("if grep -c rubber.*mysql_sql /etc/mysql/my.cnf &> /dev/null; then echo exists; fi")

data/generators/vulcanize/templates/nginx/config/rubber/deploy-nginx.rb

@@ -8,10 +8,10 @@ namespace :rubber do
     # serial_task can only be called after roles defined - not normally a problem, but
     # rubber auto-roles don't get defined till after all tasks are defined
     on :load do
-      rubber.serial_task self, :serial_restart, :roles => [:web, :web_tools] do
+      rubber.serial_task self, :serial_restart, :roles => :nginx do
         run "/etc/init.d/nginx restart"
       end
-      rubber.serial_task self, :serial_reload, :roles => [:web, :web_tools] do
+      rubber.serial_task self, :serial_reload, :roles => :nginx do
         run "if ! ps ax | grep -v grep | grep -c nginx &> /dev/null; then /etc/init.d/nginx start; else /etc/init.d/nginx reload; fi"
       end
     end
@@ -21,22 +21,22 @@ namespace :rubber do
     after "deploy:restart", "rubber:nginx:reload"
     
     desc "Stops the nginx web server"
-    task :stop, :roles => [:web, :web_tools], :on_error => :continue do
+    task :stop, :roles => :nginx, :on_error => :continue do
       run "/etc/init.d/nginx stop"
     end
     
     desc "Starts the nginx web server"
-    task :start, :roles => [:web, :web_tools] do
+    task :start, :roles => :nginx do
       run "/etc/init.d/nginx start"
     end
     
     desc "Restarts the nginx web server"
-    task :restart, :roles => [:web, :web_tools] do
+    task :restart, :roles => :nginx do
       serial_restart
     end
   
     desc "Reloads the nginx web server"
-    task :reload, :roles => [:web, :web_tools] do
+    task :reload, :roles => :nginx do
       serial_reload
     end
   

data/generators/vulcanize/templates/nginx/config/rubber/role/{web → nginx}/monit-nginx.conf

@@ -6,4 +6,3 @@ check process nginx with pidfile <%= PIDFILE %>
   group nginx-<%= RUBBER_ENV %>
   start program = "/etc/init.d/nginx start"
   stop program = "/etc/init.d/nginx stop"
-  if failed host <%= rubber_env.host %> port 80 protocol http and request "/robots.txt" with timeout 10 seconds for 10 cycles then restart

data/generators/vulcanize/templates/nginx/config/rubber/role/nginx/nginx.conf

@@ -0,0 +1,42 @@
+<%
+  @path = "/etc/nginx/nginx.conf"
+  @post = "mkdir -p /mnt/nginx/logs"
+%>
+
+user www-data;
+worker_processes 10;
+
+pid /var/run/nginx.pid;
+
+events
+{
+  worker_connections 1024;
+}
+
+http
+{
+  include           /etc/nginx/mime.types;
+  default_type      application/octet-stream;
+
+  sendfile          on;
+  tcp_nopush        on;
+  tcp_nodelay       off;
+
+  gzip              on;
+  gzip_http_version 1.0;
+  gzip_comp_level   2;
+  gzip_proxied      any;
+  gzip_types        text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+  # configure log format like to Apache's "combined" log format
+  log_format        main
+                      '$remote_addr - $remote_user [$time_local] '
+                      '"$request" $status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_cookie"';
+
+  # default log files
+  error_log         /mnt/nginx/logs/error.log notice;
+  access_log        /mnt/nginx/logs/access.log main;
+
+  include /etc/nginx/rubber/*.conf;
+}

data/generators/vulcanize/templates/nginx/config/rubber/role/web_tools/nginx-tools.conf

@@ -1,74 +1,55 @@
 <%
-  @path = "/etc/nginx/nginx.conf"
-  
-  also_web = rubber_instances[rubber_env.host].role_names.include?('web') rescue false
-  # Only want to be additive if we are running web server on same host as tools
-  if also_web
-    @additive = ["# rubber-web_tools-start", "# rubber-web_tools-end"]
-  end
+  @path = "/etc/nginx/rubber/tools.conf"
 %>
 
-<%# only need this section if running without nginx configured for site %>
-<% if ! also_web %>
 
-  user www-data;
-  worker_processes  1;
-  
-  error_log  /var/log/nginx/error.log;
-  pid        /var/run/nginx.pid;
-  
-  events
-  {
-    worker_connections  1024;
-  }
-  
-<% end %>
+# This server is setup to serve http.
+server
+{
+  listen <%= rubber_env.web_tools_port %>;
+  server_name <%= rubber_env.full_host %>;
+  root /var/www;
 
-http
+  rewrite (.*) https://$host:<%= rubber_env.web_tools_ssl_port %>$1 break;
+}
+
+# This server is setup to serve https.
+server
 {
-  include       /etc/nginx/mime.types;
-  default_type  application/octet-stream;
-  
-  access_log  /var/log/nginx/access.log;
-  
-  sendfile        on;
-  
-  keepalive_timeout  65;
-  tcp_nodelay        on;
-  
-  gzip  on;
+  listen <%= rubber_env.web_tools_ssl_port %>;
+  server_name <%= rubber_env.full_host %>;
+
+  ssl                  on;
+  ssl_certificate    /etc/ssl/certs/ssl-cert-snakeoil.pem;
+  ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+  # ssl_certificate      <%= RUBBER_ROOT %>/config/snapmylife.com.crt;
+  # ssl_certificate_key  <%= RUBBER_ROOT %>/config/snapmylife.com.key;
+
+  auth_basic            "Rubber Admin Tools";
+  auth_basic_user_file  <%= RUBBER_ROOT %>/config/<%= rubber_env.app_name %>.auth;
 
-  # This server is setup to serve www.
-  server
+  client_max_body_size 10M;
+  root /var/www;
+
+
+  location /
   {
-    listen <%= rubber_env.web_tools_port %>;
-    client_max_body_size 10M;
-  
-    server_name <%= rubber_env.full_host %>;
-  
-    root /var/www;
-  
-  
-    location /
+    # If the file exists as a static file serve it directly without
+    # running all the other rewrite tests on it
+    if (-f $request_filename)
+    {
+      break;
+    }
+
+    # check for index.html for directory index
+    # if its there on the filesystem then rewite
+    # the url to add /index.html to the end of it
+    # and then break to send it to the next config rules.
+    if (-f $request_filename/index.html)
     {
-      # If the file exists as a static file serve it directly without
-      # running all the other rewrite tests on it
-      if (-f $request_filename)
-      {
-        break;
-      }
-  
-      # check for index.html for directory index
-      # if its there on the filesystem then rewite
-      # the url to add /index.html to the end of it
-      # and then break to send it to the next config rules.
-      if (-f $request_filename/index.html)
-      {
-        rewrite (.*) $1/index.html break;
-      }
+      rewrite (.*) $1/index.html break;
     }
-    
-    include /etc/nginx/rubber/*.conf;
   }
-  
+
+  include /etc/nginx/rubber/tools/*.conf;
 }

data/generators/vulcanize/templates/nginx/config/rubber/role/web_tools/tools-index.html

@@ -0,0 +1,30 @@
+<%
+  @path = "/var/www/index.html"
+%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+		<title>Rubber Admin Tools</title>
+	</head>
+	<body>
+		<h1>Rubber Admin Tools</h1>
+		<ul>
+
+      <li><a href="/munin/">Munin</a></li>
+
+      <% if cruise_host = rubber_instances.for_role('cruise').first %>
+        <li><a href="http://<%= cruise_host %>/cruise/">CruiseControl</a></li>
+      <% end %>
+
+		  <% rubber_instances.for_role('haproxy').each do |ic| %>
+		      <li><a href="/haproxy_<%= ic.name %>/">HAProxy <%= ic.name %></a></li>
+		  <% end %>
+
+      <% rubber_instances.each do |ic| %>
+          <li><a href="/monit_<%= ic.name %>/">Monit <%= ic.name %></a></li>
+      <% end %>
+
+		</ul>
+	</body>
+</html>

data/generators/vulcanize/templates/nginx/config/rubber/role/web_tools/tools-nginx.auth

@@ -0,0 +1,7 @@
+<%
+  @path = "#{RUBBER_ROOT}/config/#{rubber_env.app_name}.auth"
+  user = rubber_env.web_tools_user || 'admin'
+  pass = rubber_env.web_tools_password || rand(1000000000).to_s
+%>
+
+<%= user %>:<%= pass.crypt(sprintf('%02d', rand(100)))%>

data/generators/vulcanize/templates/nginx/config/rubber/rubber-nginx.yml

@@ -2,32 +2,9 @@
 # Uses from base rubber config
 # domain: foo.com
 
-# Uses from appserver (mongrel) rubber config 
-# appserver_base_port: 8000
-# appserver_count: 8
-
-web_tools_port: 8080
-
-security_groups:
-  web:
-    description: To open up port 80 for http server on web role
-    rules:
-      - protocol: tcp
-        from_port: 80
-        to_port: 80
-        source_ips: [0.0.0.0/0]
-  web_tools:
-    description: "To open up port #{web_tools_port} for internal/tools http server"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_tools_port}"
-        to_port: "#{web_tools_port}"
-        source_ips: [0.0.0.0/0]
+# Uses from rubber-complete.yml
+# web_tools_port: 8080
 
 roles:
-  web:
-    packages: [nginx]
-    assigned_security_groups: [web]
-  web_tools:
+  nginx:
     packages: [nginx]
-    assigned_security_groups: [web_tools]

data/generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb

@@ -7,57 +7,30 @@ namespace :rubber do
   
     after "rubber:install_gems", "rubber:passenger:custom_install"
     
-    task :custom_install, :roles => :web do
+    task :custom_install, :roles => :passenger do
       rubber.sudo_script 'install_passenger', <<-ENDSCRIPT
-        if [[ ! -f /usr/lib/ruby/gems/*/gems/passenger-*/ext/apache2/mod_passenger.so ]]; then
+        if [[ -z `ls /usr/lib/ruby/gems/*/gems/passenger-*/ext/apache2/mod_passenger.so 2> /dev/null` ]]; then
           echo -en "\n\n\n\n" | passenger-install-apache2-module
-          # disable ubuntu default site
-          a2dissite default
         fi
       ENDSCRIPT
-    end  
-    
-    # serial_task can only be called after roles defined - not normally a problem, but
-    # rubber auto-roles don't get defined till after all tasks are defined
-    on :load do
-      rubber.serial_task self, :serial_restart, :roles => :web do
-        run "/etc/init.d/apache2 restart"
-      end
-      rubber.serial_task self, :serial_reload, :roles => :web do
-        run "if ! ps ax | grep -v grep | grep -c apache2 &> /dev/null; then /etc/init.d/apache2 start; else /etc/init.d/apache2 reload; fi"
-      end
-    end
-    
-    desc "Stops the apache web server"
-    task :stop, :roles => :web, :on_error => :continue do
-      run "/etc/init.d/apache2 stop"
     end
-    
-    desc "Starts the apache web server"
-    task :start, :roles => :web do
-      run "/etc/init.d/apache2 start"
-    end
-    
-    desc "Restarts the apache web server"
-    task :restart, :roles => :web do
-      serial_restart
-    end
-  
-    desc "Reloads the apache web server"
-    task :reload, :roles => :web do
-      serial_reload
+
+    after "rubber:setup_app_permissions", "rubber:passenger:setup_passenger_permissions"
+
+    task :setup_passenger_permissions, :roles => :passenger do
+      run "chown #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/config/environment.rb"
     end
+
+    # passenger depends on apache for start/stop/restart, just need these defined
+    # as apache hooks into standard deploy lifecycle
     
-    deploy.task :restart, :roles => :web do
-      rubber.passenger.restart
+    deploy.task :restart, :roles => :app do
     end
     
-    deploy.task :stop, :roles => :web do
-      rubber.passenger.stop
+    deploy.task :stop, :roles => :app do
     end
     
-    deploy.task :start, :roles => :web do
-      rubber.passenger.start
+    deploy.task :start, :roles => :app do
     end
     
   end

data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf

@@ -0,0 +1,6 @@
+<%
+  @path = '/etc/sudoers'
+  @additive = ["# munin passenger start", "# munin passenger end"]
+%>
+
+nobody  ALL=(ALL) NOPASSWD: /usr/bin/passenger-status

data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf

@@ -0,0 +1,47 @@
+<%
+  @path = "/etc/munin/plugins/passenger_status"
+  @perms = 0755
+%>#!/usr/bin/env ruby
+
+# from http://gist.github.com/21328
+# by Dan Manges, http://www.dcmanges.com/blog/rails-application-visualization-with-munin
+
+def output_config
+  puts <<-END
+graph_category App
+graph_title passenger status
+graph_vlabel count
+
+sessions.label sessions
+max.label max processes
+running.label running processes
+active.label active processes
+END
+  exit 0
+end
+
+def output_values
+  status = `sudo /usr/bin/passenger-status`
+  unless $?.success?
+    $stderr.puts "failed executing passenger-status"
+    exit 1
+  end
+  status =~ /max\s+=\s+(\d+)/
+  puts "max.value #{$1}"
+
+  status =~ /count\s+=\s+(\d+)/
+  puts "running.value #{$1}"
+
+  status =~ /active\s+=\s+(\d+)/
+  puts "active.value #{$1}"
+
+  total_sessions = 0
+  status.scan(/Sessions: (\d+)/).flatten.each { |count| total_sessions += count.to_i }
+  puts "sessions.value #{total_sessions}"
+end
+
+if ARGV[0] == "config"
+  output_config
+else
+  output_values
+end