deprec 2.1.16 → 2.1.17

data/CHANGELOG

@@ -1,6 +1,11 @@
 # deprec changelog
 
-= 2.1.16 (Jan 13, 2010)
+= 2.1.17 (Feb 1, 2011)
+
+* Passenger vhost sets RackEnv and RailsEnv
+* nagios-3.2.3
+
+= 2.1.16 (Jan 13, 2011)
 
 * bugfix: ddt does not require call to 'configure'
 

data/lib/deprec/recipes/nagios.rb

@@ -13,8 +13,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       # default :application, 'nagios' 
       
       SRC_PACKAGES[:nagios] = {
-        :url => "http://prdownloads.sourceforge.net/sourceforge/nagios/nagios-3.2.1.tar.gz",
-        :md5sum => "d4655ee8c95c9679fd4fd53dac34bbe3  nagios-3.2.1.tar.gz",
+        :url => "http://prdownloads.sourceforge.net/sourceforge/nagios/nagios-3.2.3.tar.gz",
+        :md5sum => "fe1be46e6976a52acdb021a782b5d04b  nagios-3.2.3.tar.gz",
         :configure => "./configure --with-command-group=nagcmd;",
         :make => 'make all;',
         :install => 'make install install-init install-commandmode install-webconf;'

data/lib/deprec/recipes/users.rb

@@ -10,7 +10,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Create account"
       task :add do
         [users_target_user, users_target_group, users_make_admin] # get input
-        
+       
         while true do
           new_password = Capistrano::CLI.ui.ask("Enter new password for #{users_target_user}") { |q| q.echo = false }
           password_conf = Capistrano::CLI.ui.ask("Re-enter new password for #{users_target_user}") { |q| q.echo = false }
@@ -22,19 +22,26 @@ Capistrano::Configuration.instance(:must_exist).load do
             break
           end
         end 
-        
-        deprec2.useradd(users_target_user, :shell => '/bin/bash')
 
-        deprec2.invoke_with_input("passwd #{users_target_user}", /UNIX password/, new_password)
-        
-        if users_make_admin.match(/y/i)
-          deprec2.groupadd('admin')
-          deprec2.add_user_to_group(users_target_user, 'admin')
-          deprec2.append_to_file_if_missing('/etc/sudoers', '%admin ALL=(ALL) ALL')
+        # Grab a list of all users with keys
+        if users_target_user == 'all'
+          set :users_target_user, Dir.entries('config/ssh/authorized_keys').reject{|f| ['.','..'].include? f}
         end
+
+        Array(users_target_user).each do |user| 
         
-        set :target_user, users_target_user
-        top.deprec.ssh.setup_keys
+          deprec2.useradd(user, :shell => '/bin/bash')
+          deprec2.invoke_with_input("passwd #{user}", /UNIX password/, new_password)
+        
+          if users_make_admin.match(/y/i)
+            deprec2.groupadd('admin')
+            deprec2.add_user_to_group(user, 'admin')
+            deprec2.append_to_file_if_missing('/etc/sudoers', '%admin ALL=(ALL) ALL')
+          end
+        
+          set :target_user, user
+          top.deprec.ssh.setup_keys
+        end
         
       end
   

data/lib/deprec/recipes/vmware_tools.rb

@@ -0,0 +1,15 @@
+# Copyright 2006-2008 by Mike Bailey. All rights reserved.
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :deprec do
+    namespace :vmware_tools do
+
+      desc "Install VMware tools on guest" 
+      task :install do
+        run "#{sudo} mount /dev/cdrom /mnt"
+        run "tar zxfv /mnt/VMwareTools-*.tar.gz"
+        run "#{sudo} ./vmware-tools-distrib/vmware-install.pl --default"
+      end
+
+    end
+  end
+end

data/lib/deprec/recipes_minus_rails.rb

@@ -8,6 +8,7 @@ require "#{File.dirname(__FILE__)}/recipes/deprecated"
 
 # require "#{File.dirname(__FILE__)}/recipes/chef"
 require "#{File.dirname(__FILE__)}/recipes/ec2"
+require "#{File.dirname(__FILE__)}/recipes/vmware_tools"
 
 require "#{File.dirname(__FILE__)}/recipes/app/mongrel"
 require "#{File.dirname(__FILE__)}/recipes/app/passenger"

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

@@ -9,6 +9,7 @@
 	  CustomLog <%= apache_log_dir %>/<%= application %>-access.log combined
 	  ErrorLog <%= apache_log_dir %>/<%= application %>-error.log
 	  
+	  RackEnv <%= rails_env %>
 	  RailsEnv <%= rails_env %>
 	  # RailsAllowModRewrite <%= passenger_rails_allow_mod_rewrite %>
 	  #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deprec
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 2
   - 1
-  - 16
-  version: 2.1.16
+  - 17
+  version: 2.1.17
 platform: ruby
 authors: 
 - Mike Bailey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +11:00
+date: 2011-02-04 00:00:00 +11:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - lib/deprec/recipes/ntp.rb
 - lib/deprec/recipes/ssh.rb
 - lib/deprec/recipes/bash.rb
+- lib/deprec/recipes/vmware_tools.rb
 - lib/deprec/recipes/logrotate.rb
 - lib/deprec/recipes/starling.rb
 - lib/deprec/recipes/lvm.rb
@@ -109,6 +110,7 @@ files:
 - lib/deprec/recipes/vnstat.rb
 - lib/deprec/recipes/ubuntu.rb
 - lib/deprec/recipes/syslog_ng.rb
+- lib/deprec/recipes/nagios-3.2.3.tar.gz
 - lib/deprec/recipes/ec2.rb
 - lib/deprec/recipes/sphinx.rb
 - lib/deprec/recipes/monit.rb