railslove_deploy 0.2.0 → 0.3.0

data/lib/railslove/recipes/backup.rb

@@ -2,7 +2,7 @@ namespace :backup do
   
   desc "Create a new backup using the astrails-safe config script from config/server/backup.rb"
   task :run do 
-    sudo "cd #{current_path}; /usr/local/ruby-enterprise/bin/astrails-safe -v #{current_path}/config/server/backup.rb"
+    sudo "cd #{current_path}; /usr/local/ruby-enterprise/bin/astrails-safe -v #{current_path}/config/server/#{fetch(:backup_script, "backup.rb")}"
   end
   
 end

data/lib/railslove/recipes/hooks.rb

@@ -10,21 +10,23 @@ namespace :hooks do
       url = URI.parse("http://twitter.com/statuses/update.json")
       
       status = Capistrano::CLI.ui.ask("Update Twitter status to: (leave blank to skip)")
+      user =  fetch(:twitter_user, nil).nil? ? Capistrano::CLI.ui.ask("Twitter username: ") : fetch(:twitter_user, nil)
+      passwd = fetch(:twitter_password, nil).nil? ? Capistrano::CLI.password_prompt("Twitter password for @#{user}: ") : fetch(:twitter_password, nil)
       unless status.empty?
       
         http = Net::HTTP.new(url.host, 80)
         http.open_timeout = 20
       
-        headers = {'Authorization' => 'Basic ' + ["#{twitter_user}:#{twitter_password}"].pack('m').delete("\r\n")}
+        headers = {'Authorization' => 'Basic ' + ["#{user}:#{passwd}"].pack('m').delete("\r\n")}
       
         body = "status=#{CGI.escape(status)}"
         begin
           http.send(:post, url.path, body, headers) 
+          puts "Status updated..."
         rescue Timeout::Error => e
           puts "Timeout after 20s: Seems like Twitter is down."
-          puts "Use \"cap twitter:update\" to update Twitter status later w/o deploying"
+          puts "Use \"cap hooks:twitter:update\" to update Twitter status later w/o deploying"
         end
-        # if an exception is thrown, let them see it, they're a developer (most likely)
       end
     end
   end

data/lib/railslove/recipes/munin_node.rb

@@ -0,0 +1,10 @@
+namespace :munin_node do
+  
+  desc "Upload the munin node configuration"
+  task :configure do 
+    put render("config/server/munin-node.conf.erb", binding), "/tmp/munin_node"
+    sudo "mv /tmp/munin_node /etc/munin/munin-node.conf"
+    sudo "chown -R root:root /etc/munin/munin-node.conf"
+  end
+  
+end

data/lib/railslove/recipes/shared.rb

@@ -1,15 +1,19 @@
 namespace :shared do
+  
+  # source is the file/folder within the release 
+  # target is the file/folder in the shared folder
+  
   task :setup do
     fetch(:shared_files,{}).each do |source,target|
-      path = File.directory?(source) ? File.dirname(target) : target
+      path = File.directory?(source) ? target : File.dirname(target)
       run "mkdir -p #{shared_path}/#{path}"
     end
   end
 
   task :symlink do 
     fetch(:shared_files,{}).each do |source,target|
-      run "rm -rf #{source}"
-      run "ln -s #{shared_path}/#{target} #{release_path}/#{source}"
+      run "rm -rf #{release_path}/#{source}"
+      run "ln -nfs #{shared_path}/#{target} #{release_path}/#{source}"
     end
   end
   

data/lib/railslove/sprinkle/monit.rb

@@ -9,9 +9,9 @@ package :monit, :provides => :monitoring do
   
   requires :essentials, :monit_dependencies
   
-  #verify do
-  #  has_executable "monit"
-  #end
+  verify do
+    has_executable "monit"
+  end
 end
 
 package :monit_init_d do
@@ -22,9 +22,9 @@ package :monit_init_d do
     post :install, "chmod +x /etc/init.d/monit"
   end
   
-  #verify do 
-  #  has_file "/etc/init.d/monit"
-  #end
+  verify do 
+    has_file "/etc/init.d/monit"
+  end
   
 end
   

data/lib/railslove/sprinkle/munin.rb

@@ -0,0 +1,31 @@
+package :munin_node do 
+  description 'munin-node - daemon to gather system ressouce information in cooperation with the main Munin program'
+  requires :essentials
+  # the apache stats for munin need libwww-perl
+  apt 'munin-node libwww-perl'
+  
+  verify do
+    has_executable "munin-node"
+  end
+end
+
+package :munin_apache_status do 
+  description "Configure the Munin node for extended apache process, access and volumne information"
+  requires :munin_node
+  
+  noop do 
+    post :install, "ln -s /usr/share/munin/plugins/apache_accesses /etc/munin/plugins/"
+    post :install, "ln -s /usr/share/munin/plugins/apache_processes /etc/munin/plugins/"
+    post :install, "ln -s /usr/share/munin/plugins/apache_volume /etc/munin/plugins/"
+    post :install, 'sed -e "s/<\/IfModule>/ExtendedStatus On \n<\/IfModule>/g" /etc/apache2/mods-available/status.conf > /etc/apache2/mods-available/status.conf'
+  end
+end
+
+package :munin do 
+  description "Munin is a networked resource monitoring tool that can help analyze resource trends"
+  apt 'munin'
+  
+  verify do 
+    has_executable "munin"
+  end
+end

data/lib/railslove/sprinkle/passenger.rb

@@ -1,6 +1,6 @@
 package :passenger_gem do 
   description 'Phusion Passenger (aka mod_rails)'
-  version '2.2.8'
+  version '2.2.9'
   gem 'passenger'
   requires :ruby_enterprise
   
@@ -14,7 +14,7 @@ package :passenger_apache, :provides => :appserver do
   # require the apache passenger module load/conf files before installation because of a sprinkle limitation.
   requires :apache, :passenger_gem, :passenger_module_load, :passenger_module_conf
   
-  passenger_version = '2.2.8'
+  passenger_version = '2.2.9'
   
   noop do 
     pre :install, 'passenger-install-apache2-module --auto'
@@ -25,7 +25,7 @@ package :passenger_apache, :provides => :appserver do
   end
   
   verify do
-    has_file '/usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-2.2.8/ext/apache2/mod_passenger.so'
+    has_file '/usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-2.2.9/ext/apache2/mod_passenger.so'
   end
 end
 
@@ -35,7 +35,7 @@ package :passenger_module_load do
   requires :apache, :passenger_gem
   
   #TODO: :render => true seems not to work? hello sprinkle?!
-  passenger_version = '2.2.8'
+  passenger_version = '2.2.9'
   transfer "#{File.dirname(__FILE__)}/../templates/passenger.load", "/etc/apache2/mods-available/passenger.load", :render => true
   
   verify do
@@ -49,7 +49,7 @@ package :passenger_module_conf do
   requires :apache, :passenger_gem
   
   #TODO: :render => true seems not to work? hello sprinkle?!  
-  passenger_version = '2.2.8'
+  passenger_version = '2.2.9'
   transfer "#{File.dirname(__FILE__)}/../templates/passenger.conf", "/etc/apache2/mods-available/passenger.conf", :render => true
   
   verify do

data/lib/railslove/templates/deploy.rb

@@ -77,8 +77,11 @@ set :use_sudo, false
 
 # the files and directories that you want to share between the releases of your application
 # for example:
-# set :shared_files, {:files => "files"}
-# symlinks <release>/files to <shared>/files and 
+# set :shared_files, {"public/files" => "files"}
+# symlinks <release>/public/files to <shared>/files and 
+# set :shared_files, {"config/myconf.rb" => "config/myconfig.rb"}
+# symlinks <release>/config/myconfig.rb to <shared>/config/myconfig.rb and
+
 
 set :shared_files, {}
 
@@ -137,6 +140,19 @@ after "deploy:setup",
   "ferm:configure"
 
 
+#############################################################################
+# Munin configuration
+#############################################################################
+
+# A list of addresses that are allowed to connect to the munin-node. 
+# Add the IP address of your munin-server.
+
+set :munin_allow_from_addresses, ["127.0.0.1"]
+
+after "deploy:setup", 
+  "munin_node:configure"
+  
+
 #############################################################################
 # Logrotation configuration
 #############################################################################
@@ -165,6 +181,7 @@ after "deploy:setup",
   "apache:upload_vhost_config",
   "db:upload_config_yml",
   "gems:install"
+  "shared:setup"
   
 after "deploy:cold",
   "apache:enable_site",

data/lib/railslove/templates/munin-node.conf.erb

@@ -0,0 +1,45 @@
+#
+# Example config-file for munin-node
+#
+
+log_level 4
+log_file /var/log/munin/munin-node.log
+pid_file /var/run/munin/munin-node.pid
+
+background 1
+setseid 1
+
+user root
+group root
+setsid yes
+
+# Regexps for files to ignore
+
+ignore_file ~$
+ignore_file \.bak$
+ignore_file %$
+ignore_file \.dpkg-(tmp|new|old|dist)$
+ignore_file \.rpm(save|new)$
+ignore_file \.pod$
+
+# Set this if the client doesn't report the correct hostname when
+# telnetting to localhost, port 4949
+#
+#host_name localhost.localdomain
+
+# A list of addresses that are allowed to connect.  This must be a
+# regular expression, due to brain damage in Net::Server, which
+# doesn't understand CIDR-style network notation.  You may repeat
+# the allow line as many times as you'd like
+
+<% for address in fetch(:munin_allow_from_addresses, ['127.0.0.1'] %>
+allow ^<%= address.gsub('.','\.') %>$
+<% end %>
+
+# Which address to bind to;
+host *
+# host 127.0.0.1
+
+# And which port
+port 4949
+

data/lib/railslove/templates/passenger.conf

@@ -1,3 +1,3 @@
-PassengerRoot /usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version || "2.2.8" %>
+PassengerRoot /usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version || "2.2.9" %>
 PassengerRuby /usr/local/ruby-enterprise/bin/ruby
 RailsEnv production

data/lib/railslove/templates/passenger.load

@@ -1 +1 @@
-LoadModule passenger_module /usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version || "2.2.8" %>/ext/apache2/mod_passenger.so
+LoadModule passenger_module /usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version || "2.2.9" %>/ext/apache2/mod_passenger.so

data/lib/railslove/templates/sprinkle.rb

@@ -21,6 +21,8 @@ policy :passenger_stack, :roles => :app do
   requires :ferm              # ferm iptable configuration tool
   requires :ferm_conf         # configure ferm (allow http, https and ssh)
   requires :monit             # monit - system process monitoring
+  requires :munin_node        # install munin-node for system monitoring
+  requires :munin_apache_status # configure extended apache status information
 end
 
 deployment do

data/lib/railslove/templates/vhost.erb

@@ -6,9 +6,9 @@
 	DocumentRoot /var/www/rails_apps/<%= application %>/current/public
 
 	<directory "/var/www/rails_apps/<%= application %>/current/public">
+	  AllowOverride all              # <-- relax Apache security settings
+    Options -MultiViews            # <-- MultiViews must be turned off
 		Options FollowSymLinks
-		Order allow,deny
-		Allow from all
 	</directory>
 	RailsEnv <%= fetch(:rails_env, "production") %>
 	LogLevel warn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: railslove_deploy
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michael Bumann
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +01:00
+date: 2010-02-04 00:00:00 +01:00
 default_executable: deployify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - lib/railslove/recipes/memcache.rb
 - lib/railslove/recipes/misc.rb
 - lib/railslove/recipes/monit.rb
+- lib/railslove/recipes/munin_node.rb
 - lib/railslove/recipes/passenger.rb
 - lib/railslove/recipes/shared.rb
 - lib/railslove/recipes/sphinx.rb
@@ -60,6 +61,7 @@ files:
 - lib/railslove/sprinkle/image_magick.rb
 - lib/railslove/sprinkle/memcache.rb
 - lib/railslove/sprinkle/monit.rb
+- lib/railslove/sprinkle/munin.rb
 - lib/railslove/sprinkle/mysql.rb
 - lib/railslove/sprinkle/nginx.rb
 - lib/railslove/sprinkle/passenger.rb
@@ -82,6 +84,7 @@ files:
 - lib/railslove/templates/monitoring/sphinx.monit.erb
 - lib/railslove/templates/monitoring/sshd.monit.erb
 - lib/railslove/templates/monitrc.erb
+- lib/railslove/templates/munin-node.conf.erb
 - lib/railslove/templates/nginx.conf
 - lib/railslove/templates/nginx_init
 - lib/railslove/templates/passenger.conf