le1t0-deprec 2.1.6.022 → 2.1.6.023

data/CHANGELOG

@@ -1,5 +1,12 @@
 # deprec changelog
 
+= 2.1.6.023 (Jul 14, 2010)
+
+* added db seed and db redo tasks to rails recipe
+* added server_aliases setting to passenger recipe
+* add setting RackEnv in passenger
+* add to known hosts for IP addresses as well as hostnames for SSH recipe
+
 = 2.1.6.022 (Jul 7, 2010)
 
 * add to known hosts for IP addresses as well as hostnames for nagios recipe

data/lib/deprec/recipes/app/passenger.rb

@@ -25,6 +25,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :passenger_rails_autodetect, 'on'
       set :passenger_rails_spawn_method, 'smart' # smart | conservative
       set :passenger_version, '2.2.11'
+      set :passenger_server_aliases, [ ]
 
       desc "Install passenger"
       task :install, :roles => :app do

data/lib/deprec/recipes/rails.rb

@@ -306,6 +306,16 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cd #{deploy_to}/current && rake db:create RAILS_ENV=#{rails_env}"
       end
 
+      desc "Seed database"
+      task :seed, :roles => :app do
+        run "cd #{deploy_to}/current && rake db:seed RAILS_ENV=#{rails_env}"
+      end
+
+      desc "Redo database, only available if defined in your app"
+      task :redo, :roles => :app do
+        run "cd #{deploy_to}/current && rake db:redo RAILS_ENV=#{rails_env}"
+      end
+
       desc "Run database migrations"
       task :migrate, :roles => :app do
         run "cd #{deploy_to}/current && rake db:migrate RAILS_ENV=#{rails_env}"

data/lib/deprec/recipes/ssh.rb

@@ -68,9 +68,12 @@ Capistrano::Configuration.instance(:must_exist).load do
           run "mv ~/.ssh/authorized_keys.new ~/.ssh/authorized_keys"
         end
 
+        require 'socket'
         if ssh_known_hosts.size > 0
-          put ssh_known_hosts.join("\n"), tmp_file = "/tmp/ssh_keyscan_#{Time.now.strftime("%Y%m%d%H%M%S")}.txt", :mode => 0644
-          run "ssh-keyscan -f #{tmp_file} -t rsa > ~/.ssh/known_hosts ; rm -f #{tmp_file}"
+          hosts_and_ips = (ssh_known_hosts + ssh_known_hosts.collect { |h| Socket.getaddrinfo(h, 0, Socket::AF_INET, Socket::SOCK_STREAM, Socket::IPPROTO_TCP, Socket::INADDR_ANY).first[3] })
+          put (hosts_and_ips + [""]).join("\n"), tmp_file = "/tmp/ssh_keyscan_#{Time.now.strftime("%Y%m%d%H%M%S")}.txt", :mode => 0644
+          run "ssh-keyscan -f #{tmp_file} -t rsa > ~/.ssh/known_hosts"
+          run "rm -f #{tmp_file}"
         end
       end
       

data/lib/deprec/templates/passenger/apache_vhost.erb

@@ -2,14 +2,15 @@
 <IfModule passenger_module>
 	<VirtualHost *:80>
 	  ServerName <%= domain %>
-      <%- 4.times do |counter| -%>
-        ServerAlias <%= domain.sub(/.*?\./, "assets#{counter}.") %>
+      <%- passenger_server_aliases.each do |server_alias| -%>
+        ServerAlias <%= server_alias %>
       <%- end %>
 	  DocumentRoot "<%= passenger_document_root %>"
 	  CustomLog <%= apache_log_dir %>/<%= application %>-access.log combined
 	  ErrorLog <%= apache_log_dir %>/<%= application %>-error.log
 	  
 	  RailsEnv <%= rails_env %>
+	  RackEnv <%= rails_env %>
 	  # RailsAllowModRewrite <%= passenger_rails_allow_mod_rewrite %>
 	  #
 	  # Check for maintenance file and redirect all requests

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 1
   - 6
-  - 22
-  version: 2.1.6.022
+  - 23
+  version: 2.1.6.023
 platform: ruby
 authors: 
 - Le1t0
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 +02:00
+date: 2010-07-14 00:00:00 +02:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency