deprec 1.4.1 → 1.4.2

data/lib/deprec/capistrano_extensions/deprec_extensions.rb

@@ -53,8 +53,11 @@ module Deprec
 
   
   # create new user account on target system
-  def useradd(user)
-    send(run_method, "grep '^#{user}:' /etc/passwd || sudo /usr/sbin/useradd -m #{user}")
+  def useradd(user, options={})
+    switches = ''
+    switches += ' --create-home ' unless options[:homedir] == false
+    switches += " --gid #{options[:group]} " unless options[:group].nil?
+    send(run_method, "grep '^#{user}:' /etc/passwd || sudo /usr/sbin/useradd #{switches} #{user}")
   end
   
   # create a new group on target system

data/lib/deprec/generators/deprec/templates/deploy.rb

@@ -39,8 +39,8 @@ set :rails_env, "production"
 set :apache_server_name, domain
 # set :apache_server_aliases, %w{alias1 alias2}
 # set :apache_default_vhost, true # force use of apache_default_vhost_config
-# set :apache_default_vhost_conf, "/etc/httpd/conf/default.conf"
-# set :apache_conf, "/etc/httpd/conf/apps/#{application}.conf"
+# set :apache_default_vhost_conf, "/usr/local/apache2/conf/default.conf"
+# set :apache_conf, "/usr/local/apache2/conf/apps/#{application}.conf"
 # set :apache_ctl, "/etc/init.d/httpd"
 # set :apache_proxy_port, 8000
 # set :apache_proxy_servers, 2
@@ -59,8 +59,8 @@ set :apache_server_name, domain
 set :mongrel_address, apache_proxy_address
 # set :mongrel_environment, "production"
 # set :mongrel_config, "/etc/mongrel_cluster/#{application}.conf"
-# set :mongrel_user, user
-# set :mongrel_group, group
+set :mongrel_user, "mongrel_#{application}"
+set :mongrel_group, "app_#{application}"
 
 # =============================================================================
 # MYSQL OPTIONS

data/lib/deprec/recipes.rb

@@ -29,10 +29,20 @@ Capistrano.configuration(:must_exist).load do
     install_apache
   end
   
-  desc "Set up the expected application directory structure on all boxes"
+  desc <<-DESC
+  deprecated: this function has been replaced by :before_setup and :after_setup
+  DESC
   task :deprec_setup, :except => { :no_release => true } do
-    setup_paths
     setup
+  end
+  
+  desc "creates paths required by Capistrano's :setup task"
+  task :before_setup, :except => { :no_release => true } do
+    setup_paths
+  end
+  
+  desc "sets up and configures servers "
+  task :after_setup, :except => { :no_release => true } do
     setup_servers
   end
   
@@ -42,7 +52,23 @@ Capistrano.configuration(:must_exist).load do
     setup_paths
     setup_app
     setup_symlinks
-    setup_db
+    setup_db # XXX fails is database already exists
+  end
+  
+  task :after_update, :roles => :app do
+    set_perms_for_mongrel_dirs
+  end
+  
+  desc "set group ownership and permissions on dirs mongrel needs to write to"
+  task :set_perms_for_mongrel_dirs, :roles => :app do
+    tmp_dir = "#{deploy_to}/current/tmp"
+    shared_dir = "#{deploy_to}/shared"
+    files = ["#{deploy_to}/shared/log/mongrel.log", "#{deploy_to}/shared/log/#{rails_env}.log"]
+    
+    sudo "chgrp -R #{mongrel_group} #{tmp_dir} #{shared_dir}"
+    sudo "chmod 0775 #{tmp_dir} #{shared_dir}" 
+    sudo "chown #{mongrel_user} #{files.join(' ')}"   
+    sudo "chgrp #{mongrel_group} #{files.join(' ')}"   
   end
   
   desc "Setup web server."
@@ -52,11 +78,21 @@ Capistrano.configuration(:must_exist).load do
     configure_apache
   end
   
+  desc "create user and group for mongel to run as"
+  task :create_mongrel_user_and_group do
+    set :mongrel_user, 'mongrel_' + application if mongrel_user.nil?
+    set :mongrel_group, 'app_' + application if mongrel_group.nil?
+    deprec.groupadd(mongrel_group) 
+    deprec.useradd(mongrel_user, :group => mongrel_group, :homedir => false)
+    sudo "usermod --gid #{mongrel_group} #{mongrel_user}"
+  end
+  
   desc "Setup application server."
   task :setup_app, :roles => :app  do
     set :mongrel_environment, rails_env
     set :mongrel_port, apache_proxy_port
     set :mongrel_servers, apache_proxy_servers
+    create_mongrel_user_and_group
     install_mongrel_start_script
     setup_mongrel_cluster_path
     configure_mongrel_cluster
@@ -117,6 +153,7 @@ Capistrano.configuration(:must_exist).load do
   end
   
   task :install_rubygems do
+    # XXX should check for presence of ruby first!
     version = 'rubygems-0.9.2'
     set :src_package, {
       :file => version + '.tgz',
@@ -128,6 +165,7 @@ Capistrano.configuration(:must_exist).load do
     }
     deprec.download_src(src_package, src_dir)
     deprec.install_from_src(src_package, src_dir)
+    gem.upgrade
     gem.update_system
   end
     
@@ -135,11 +173,11 @@ Capistrano.configuration(:must_exist).load do
     version = 'httpd-2.2.4'
     set :src_package, {
       :file => version + '.tar.gz',   
-      :md5sum => '3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.3.tar.gz', 
+      :md5sum => '3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz', 
       :dir => version,  
       :url => "http://www.apache.org/dist/httpd/#{version}.tar.gz",
       :unpack => "tar zxf #{version}.tar.gz;",
-      :configure => './configure --enable-proxy --enable-proxy-balancer --enable-proxy-http --enable-rewrite  --enable-cache --enable-headers --enable-ssl --enable-deflate;',
+      :configure => './configure --enable-proxy --enable-proxy-balancer --enable-proxy-http --enable-rewrite  --enable-cache --enable-headers --enable-ssl --enable-deflate --with-included-apr;',
       :make => 'make;',
       :install => 'make install;',
       :post_install => 'install -b support/apachectl /etc/init.d/httpd;'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
-date: 2007-03-24 00:00:00 +05:30
+  version: 1.4.2
+date: 2007-05-03 00:00:00 +10:00
 summary: deployment recipes for capistrano
 require_paths: 
 - lib
@@ -94,7 +94,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.4.1
     version: