deprec 2.0.1 → 2.0.2

data/CHANGELOG

@@ -1,5 +1,20 @@
 == git
 
+== 2.0.2 (March 3, 2009)
+
+* Change owner of config/environment.rb to the value of app_user after deploy
+  so Passenger will run app as this user [mbailey]
+
+* bugfix: set homedir for app_user account to value of deploy_to. 
+  Passenger complains if homedir for user it runs as doesn't exist. [mbailey]
+
+* Run the database rake tasks on the app server, not the db server. [mbailey]
+  e.g. cap deprec:database:schema_load
+
+* Updated to ruby-enterprise-1.8.6-20090201
+
+* Scan for ssh public key if not provided locally
+
 
 == 2.0.1 (February 20, 2009)
 

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

@@ -61,13 +61,13 @@ Capistrano::Configuration.instance(:must_exist).load do
          :mode => 0644,
          :owner => 'root:root'},
          
-        {:template => 'nginx_vhost.erb',
+        {:template => 'nginx_vhost.conf.erb',
          :path => "nginx_vhost.conf", 
          :mode => 0644,
          :owner => 'root:root'},
          
-        {:template => 'apache_vhost.erb',
-         :path => "apache_vhost", 
+        {:template => 'apache_vhost.conf.erb',
+         :path => "apache_vhost.conf", 
          :mode => 0644,
          :owner => 'root:root'}
       
@@ -111,11 +111,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
       task :symlink_apache_vhost, :roles => :app do
-        sudo "ln -sf #{deploy_to}/mongrel/apache_vhost #{apache_vhost_dir}/#{application}"
+        sudo "ln -sf #{deploy_to}/mongrel/apache_vhost.conf #{apache_vhost_dir}/#{application}.conf"
       end
       
       task :symlink_nginx_vhost, :roles => :app do
-        sudo "ln -sf #{deploy_to}/mongrel/nginx_vhost #{nginx_vhost_dir}/#{application}"
+        sudo "ln -sf #{deploy_to}/mongrel/nginx_vhost.conf #{nginx_vhost_dir}/#{application}.conf"
       end
       
       task :symlink_monit_config, :roles => :app do

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

@@ -134,8 +134,13 @@ Capistrano::Configuration.instance(:must_exist).load do
         deprec2.push_configs(:passenger, PROJECT_CONFIG_FILES[:passenger])
         symlink_apache_vhost
         activate_project
+        set_ownership_of_environment_rb
       end
-
+      
+      task :set_ownership_of_environment_rb, :roles => :app do
+        sudo "chown #{app_user} #{current_path}/config/environment.rb"
+      end
+      
       task :symlink_apache_vhost, :roles => :app do
         sudo "ln -sf #{deploy_to}/passenger/apache_vhost #{apache_vhost_dir}/#{application}"
       end

data/lib/deprec/recipes/deprec.rb

@@ -62,19 +62,19 @@ Capistrano::Configuration.instance(:must_exist).load do
   # end
 
   default(:application) do
-    Capistrano::CLI.ui.ask "enter name of project(no spaces)" do |q|
+    Capistrano::CLI.ui.ask "Enter name of project(no spaces)" do |q|
       q.validate = /^[0-9a-z_]*$/
     end
   end 
 
   default(:domain) do
-    Capistrano::CLI.ui.ask "enter domain name for project" do |q|
+    Capistrano::CLI.ui.ask "Enter domain name for project" do |q|
       q.validate = /^[0-9a-z_\.]*$/
     end
   end
 
   default(:repository) do
-    Capistrano::CLI.ui.ask "enter repository URL for project" do |q|
+    Capistrano::CLI.ui.ask "Enter repository URL for project" do |q|
       # q.validate = //
     end
   end

data/lib/deprec/recipes/nagios.rb

@@ -39,7 +39,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         deprec2.groupadd(nagios_cmd_group)
         deprec2.add_user_to_group(nagios_user, nagios_cmd_group)
         # Add apache user to nagios group to permit commands via web interface
-        deprec2.add_user_to_group(apache_user, nagios_cmd_group)
+        deprec2.add_user_to_group('daemon', nagios_cmd_group)
       end
          
       # Install dependencies for nagios
@@ -125,7 +125,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Push nagios config files to server"
       task :config, :roles => :nagios do
-        set :application, 'nagios'
+        default :application, 'nagios'
         deprec2.push_configs(:nagios, SYSTEM_CONFIG_FILES[:nagios])
         sudo "ln -sf #{deploy_to}/nagios/conf/nagios_apache_vhost.conf /usr/local/apache2/conf/apps"
         config_check
@@ -302,4 +302,4 @@ Capistrano::Configuration.instance(:must_exist).load do
       
     
   end
-end
+end

data/lib/deprec/recipes/rails.rb

@@ -5,6 +5,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   set(:app_user) { app_user_prefix + application }
   set :app_group_prefix,  'app_'
   set(:app_group) { app_group_prefix + application }
+  set(:app_user_homedir) { deploy_to }
   set :database_yml_in_scm, true
   set :app_symlinks, nil
   set :rails_env, 'production'
@@ -40,10 +41,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     set_owner_of_environment_rb if web_server_type.to_s == 'passenger'
   end
 
-  after :deploy, :roles => :app do
-    deploy.cleanup
-  end
-
+  after :deploy, "deploy:cleanup"
+  
   namespace :deprec do
     namespace :rails do
       
@@ -163,7 +162,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         deprec2.useradd(app_user, :group => app_group, :homedir => false)
         # Set the primary group for the user the application runs as (in case 
         # user already existed when previous command was run)
-        sudo "usermod --gid #{app_group} #{app_user}"
+        sudo "usermod --gid #{app_group} --home #{app_user_homedir} #{app_user}"
       end
       
       task :set_perms_on_shared_and_releases, :roles => :app do
@@ -294,22 +293,22 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :database do
       
       desc "Create database"
-      task :create, :roles => :db do
+      task :create, :roles => :app do
         run "cd #{deploy_to}/current && rake db:create RAILS_ENV=#{rails_env}"
       end
 
       desc "Run database migrations"
-      task :migrate, :roles => :db do
+      task :migrate, :roles => :app do
         run "cd #{deploy_to}/current && rake db:migrate RAILS_ENV=#{rails_env}"
       end
       
       desc "Run database migrations"
-      task :schema_load, :roles => :db do
+      task :schema_load, :roles => :app do
         run "cd #{deploy_to}/current && rake db:schema:load RAILS_ENV=#{rails_env}"
       end
 
       desc "Roll database back to previous migration"
-      task :rollback, :roles => :db do
+      task :rollback, :roles => :app do
         run "cd #{deploy_to}/current && rake db:rollback RAILS_ENV=#{rails_env}"
       end
 

data/lib/deprec/recipes/ruby/ree.rb

@@ -3,13 +3,13 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do     
     namespace :ree do
       
-      set :ree_version, 'ruby-enterprise-1.8.6-20090113'
+      set :ree_version, 'ruby-enterprise-1.8.6-20090201'
       set :ree_install_dir, "/opt/#{ree_version}"
       set :ree_short_path, '/opt/ruby-enterprise'
       
       SRC_PACKAGES[:ree] = {
-        :md5sum => "e8d796a5bae0ec1029a88ba95c5d901d #{ree_version}.tar.gz",
-        :url => "http://rubyforge.org/frs/download.php/50087/#{ree_version}.tar.gz",
+        :md5sum => "a965e6789b553efaed72191825b13713 #{ree_version}.tar.gz",
+        :url => "http://rubyforge.org/frs/download.php/51100/#{ree_version}.tar.gz",
         :configure => '',
         :make => '',
         :install => "./installer --auto /opt/#{ree_version}"

data/lib/deprec/recipes/ssh.rb

@@ -62,9 +62,26 @@ Capistrano::Configuration.instance(:must_exist).load do
           end
         }
         
-        if target_user == user
+        # If we have an authorized keys file for this user
+        # then copy that out
+        if File.exists?("config/ssh/authorized_keys/#{target_user}") 
+          deprec2.mkdir "/home/#{target_user}/.ssh", :mode => 0700, :owner => "#{target_user}.users", :via => :sudo
+          std.su_put File.read("config/ssh/authorized_keys/#{target_user}"), "/home/#{target_user}/.ssh/authorized_keys", '/tmp/', :mode => 0600
+          sudo "chown #{target_user}.users /home/#{target_user}/.ssh/authorized_keys"
+        
+        elsif target_user == user
+          
+          # If the user has specified a key Capistrano should use
+          if ssh_options[:keys]
+            deprec2.mkdir '.ssh', :mode => 0700
+            put(ssh_options[:keys].collect{|key| File.read(key)}.join("\n"), '.ssh/authorized_keys', :mode => 0600 )
           
-          unless ssh_options[:keys]  
+          # Try to find the current users public key
+          elsif keys = %w[id_rsa id_dsa identity].collect { |f| "#{ENV['HOME']}/.ssh/#{f}.pub" if File.exists?("#{ENV['HOME']}/.ssh/#{f}.pub") }.compact
+            deprec2.mkdir '.ssh', :mode => 0700
+            put(keys.collect{|key| File.read(key)}.join("\n"), '.ssh/authorized_keys', :mode => 0600 )
+            
+          else
             puts <<-ERROR
 
             You need to define the name of your SSH key(s)
@@ -75,17 +92,18 @@ Capistrano::Configuration.instance(:must_exist).load do
             ERROR
             exit
           end
-        
-          deprec2.mkdir '.ssh', :mode => 0700
-          put(ssh_options[:keys].collect{|key| File.read(key+'.pub')}.join("\n"), '.ssh/authorized_keys', :mode => 0600 )
+        else
+          puts <<-ERROR
           
-        else  
+          Could not find ssh public key(s) for user #{user}
           
-          deprec2.mkdir "/home/#{target_user}/.ssh", :mode => 0700, :owner => "#{target_user}.users", :via => :sudo
-          std.su_put File.read("config/ssh/authorized_keys/#{target_user}"), "/home/#{target_user}/.ssh/authorized_keys", '/tmp/', :mode => 0600
-          sudo "chown #{target_user}.users /home/#{target_user}/.ssh/authorized_keys"
+          Please create file containing ssh public keys in:
           
+            config/ssh/authorized_keys/#{target_user}
+            
+          ERROR
         end
+        
       end
       
     end

data/lib/deprec/recipes/ubuntu.rb

@@ -2,19 +2,34 @@
 Capistrano::Configuration.instance(:must_exist).load do 
   namespace :deprec do
     namespace :ubuntu do
-      
+
+      desc "apt-get update. Resynchronize the package index files from their sources."
       task :update do
         apt.update
       end
       
+      desc "apt-get upgrade. Install the newest versions of all packages currently
+                 installed on the system from the sources enumerated in /etc/apt/sources.list.."
       task :upgrade do
         apt.upgrade
       end
       
+      desc "reboot the server"
       task :restart do
         sudo "reboot"
       end
       
+      desc "shut down the server"
+      task :shutdown do
+        sudo "shutdown -h now"
+      end
+      
+      desc "Remove locks from aborted apt-get command."
+      task :remove_locks do
+        sudo "rm /var/lib/apt/lists/lock"
+        # XXX There's one more - add it!
+      end
+      
     end
   end
-end
+end

data/lib/deprec/recipes/wordpress.rb

@@ -3,7 +3,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   require 'digest'
   
-  set :application,  'wordpress'
+  default :application,  'wordpress'
   set(:wordpress_domain) { Capistrano::CLI.ui.ask 'Enter domain wordpress will be served on' }
   set :db_name,     'wordpress'
   set :db_user,     'wordpress'

data/lib/deprec/recipes/xen.rb

@@ -15,17 +15,20 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Install Xen"
       task :install, :roles => :dom0 do
         install_deps
+        top.deprec.xentools.install
         disable_apparmour
         disable_tls
-        enable_hardy_domu
+        # enable_hardy_domu Should only be run on gutsy
         initial_config
       end
       
       task :install_deps, :roles => :dom0 do
         # for amd64 version of ubuntu 7.10
-        apt.install( {:base => %w(linux-image-xen bridge-utils libxen3.1 python-xen-3.1 xen-docs-3.1 xen-hypervisor-3.1 xen-ioemu-3.1 xen-tools xen-utils-3.1 lvm2)}, :stable )
+        # apt.install( {:base => %w(linux-image-xen bridge-utils libxen3.1 python-xen-3.1 xen-docs-3.1 xen-hypervisor-3.1 xen-ioemu-3.1 xen-tools xen-utils-3.1 lvm2)}, :stable )
         # alternatively, for x86 version of ubuntu:
         # apt-get install ubuntu-xen-server libc6-xen lvm2    
+        apt.install( {:base => %w(ubuntu-xen-server libc6-xen lvm2)}, :stable )
+        
       end
       
       task :disable_apparmour, :roles => :dom0 do
@@ -39,27 +42,27 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       SYSTEM_CONFIG_FILES[:xen] = [
                 
-        {:template => "xend-config.sxp.erb",
-        :path => '/etc/xen/xend-config.sxp',
-        :mode => 0644,
-        :owner => 'root:root'},
-         
-        {:template => "xendomains.erb",
-         :path => '/etc/default/xendomains',
-         :mode => 0755,
-         :owner => 'root:root'},
-         
+        # {:template => "xend-config.sxp.erb",
+        # :path => '/etc/xen/xend-config.sxp',
+        # :mode => 0644,
+        # :owner => 'root:root'},
+        #  
+        # {:template => "xendomains.erb",
+        #  :path => '/etc/default/xendomains',
+        #  :mode => 0755,
+        #  :owner => 'root:root'},
+        #  
         # This gives you a second network bridge on second ethernet device  
         {:template => "network-bridge-wrapper",
          :path => '/etc/xen/scripts/network-bridge-wrapper',
          :mode => 0755,
          :owner => 'root:root'},
-         
-        # Bugfix for gutsy - xendomains fails to shut down domains on system shutdown
-        {:template => "xend-init.erb",
-         :path => '/etc/init.d/xend',
-         :mode => 0755,
-         :owner => 'root:root'}
+        #  
+        # # Bugfix for gutsy - xendomains fails to shut down domains on system shutdown
+        # {:template => "xend-init.erb",
+        #  :path => '/etc/init.d/xend',
+        #  :mode => 0755,
+        #  :owner => 'root:root'}
          
       ]
       
@@ -68,7 +71,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         # Non-standard! We're pushing these straight out
         SYSTEM_CONFIG_FILES[:xen].each do |file|
           deprec2.render_template(:xen, file.merge(:remote => true))
-        end      
+        end     
       end
       
       desc "Generate configuration file(s) for Xen from template(s)"
@@ -87,7 +90,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       # xen-create-image --force --ip=192.168.1.31 --hostname=x1 --mac=00:16:3E:11:12:31
       
       # Start a virtual image (and open console to it)
-      # xm create -c /etc/xen/x1.cfg
+      # xm create /etc/xen/x1.cfg -c
       
       desc "Start Xen"
       task :start, :roles => :dom0 do

data/lib/deprec/templates/mongrel/{nginx_vhost.erb → nginx_vhost.conf.erb}

@@ -6,7 +6,7 @@ upstream <%= application %> {
 
 server {
     listen       80;
-    server_name  <%= domain %> <% 4.times do |counter| %> <%= domain.sub(/.*?\./, "assets#{counter}.") %><% end %>;
+    server_name  <%= application %> <%= domain %> <% 4.times do |counter| %> <%= domain.sub(/.*?\./, "assets#{counter}.") %><% end %>;
     root <%= deploy_to %>/current/public;
     access_log <%= deploy_to %>/shared/log/<%= domain %>-access.log;
     error_log <%= deploy_to %>/shared/log/<%= domain %>-error.log;

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

@@ -2,6 +2,9 @@
 <IfModule passenger_module>
 	<VirtualHost *:80>
 	  ServerName <%= domain %>
+      <%- 4.times do |counter| -%>
+        ServerAlias <%= domain.sub(/.*?\./, "assets#{counter}.") %>
+      <%- end %>
 	  DocumentRoot "<%= passenger_document_root %>"
 	  RailsEnv <%= rails_env %>
 	  # RailsAllowModRewrite <%= passenger_rails_allow_mod_rewrite %>

data/lib/deprec/templates/xentools/xen-tools.conf.erb

@@ -257,7 +257,7 @@ reiser_options = defaults
 # serial_device = hvc0 #default
 # serial_device = tty1
 #
-# disk_device = xvda #default
+disk_device = xvda #default
 # disk_device = sda
 #
 
@@ -273,4 +273,4 @@ reiser_options = defaults
 #
 # output    = /etc/xen
 # extension = .cfg
-#
+#

data/lib/deprec/templates/xentools/xm.tmpl.erb

@@ -135,4 +135,4 @@ on_crash    = 'restart'
   }
 }
 
-extra = ' TERM=xterm xencons=tty console=tty1'
+extra = '2 console=xvc0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Mike Bailey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 +11:00
+date: 2009-03-03 00:00:00 +11:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,12 +125,12 @@ files:
 - lib/deprec/templates/logrotate
 - lib/deprec/templates/logrotate/logrotate.conf.erb
 - lib/deprec/templates/mongrel
-- lib/deprec/templates/mongrel/apache_vhost.erb
+- lib/deprec/templates/mongrel/apache_vhost.conf.erb
 - lib/deprec/templates/mongrel/logrotate.conf.erb
 - lib/deprec/templates/mongrel/mongrel_cluster-init-script
 - lib/deprec/templates/mongrel/mongrel_cluster.yml.erb
 - lib/deprec/templates/mongrel/monit.conf.erb
-- lib/deprec/templates/mongrel/nginx_vhost.erb
+- lib/deprec/templates/mongrel/nginx_vhost.conf.erb
 - lib/deprec/templates/monit
 - lib/deprec/templates/monit/monit-init-script
 - lib/deprec/templates/monit/monitrc.erb