deprec 2.2.0 → 2.2.1

data/CHANGELOG

@@ -1,6 +1,14 @@
 # deprec changelog
 
-= 2.2.1  (Jul 10, 2011)
+= 2.2.1  (Jul 15, 2011)
+
+* deprec now provides rake tasks
+
+  Just add this to your Rakefile
+
+  require 'deprec/rake'
+
+= 2.2.0  (Jul 10, 2011)
 
 * First release since rewrite of http://deprec.org
 * Tidy up of various recipes

data/docs/README.rails

@@ -1,17 +1,23 @@
-deprec: Install Ruby on Rails app on fresh Ubuntu 7.10 (gutsy), 8.04 (hardy)
-============================================================================
+Install Ruby on Rails app with deprec
+=====================================
 
-* Quickstart
+The rack recipes should work with any rack app.
 
-cd your_rails_app
-depify . 
-# Edit config/deploy.rb
-cap deprec:rails:install_stack
+*Quickstart*
 
-# WARNING! Don't run the following command if you are using a shared 
-# database server that has already been installed.
-cap deprec:db:install 
+    $ cap deprec:rack:install_stack
 
-cap deploy:setup 
-cap deploy 
-cap deploy:migrate
+    $ cd your_rails_app
+    $ depify . 
+    # Edit config/deploy.rb and config/deploy/uat.rb
+
+    # WARNING! Don't run the following command if you are using a shared 
+    # database server that has already been installed.
+    $ cap deprec:db:install 
+
+    $ cap deploy:setup HOSTS=mbailey@uat
+
+    $ cap deprec:rack:config HOSTS=mbailey@uat
+
+    # ssh to git@github.com from uat and accept hostkey
+    $ cap deploy 

data/lib/deprec/TODO.txt

@@ -0,0 +1,6 @@
+
+# Add option to symlink apache vhosts
+#
+# This will make updating with deploys easier
+#
+ln -sf /srv/brandish/current/config/uat/passenger/apache_vhost brandish

data/lib/deprec/callbacks/asset_pipeline.rb

@@ -0,0 +1,68 @@
+# Copyright 2011 Chris Griego
+#
+# Capistrano::Configuration.instance(:must_exist).load do
+# require 'capistrano/recipes/deploy'
+
+def _cset(name, *args, &block)
+  unless exists?(name)
+    set(name, *args, &block)
+  end
+end
+
+_cset :asset_env, "RAILS_GROUPS=assets"
+_cset :rails_env, "production"
+
+# rails-3.1 does not use asset timestamps
+set :normalize_asset_timestamps, false
+
+after 'deploy:update_code', 'deploy:assets:symlink'
+after 'deploy:update_code', 'deploy:assets:precompile'
+
+namespace :deploy do
+  namespace :assets do
+    desc <<-DESC
+      [internal] This task will set up a symlink to the shared directory \
+      for the assets directory. Assets are shared across deploys to avoid \
+      mid-deploy mismatches between old application html asking for assets \
+      and getting a 404 file not found error.
+    DESC
+    task :symlink, :roles => :web, :except => { :no_release => true } do
+      run <<-CMD
+        rm -rf #{latest_release}/public/assets &&
+        mkdir -p #{latest_release}/public &&
+        mkdir -p #{shared_path}/assets &&
+        ln -s #{shared_path}/assets #{latest_release}/public/assets
+      CMD
+    end
+
+    desc <<-DESC
+      Run the asset precompilation rake task. You can specify the full path \
+      to the rake executable by setting the rake variable. You can also \
+      specify additional environment variables to pass to rake via the \
+      asset_env variable. The defaults are:
+
+        set :rake,      "rake"
+        set :rails_env, "production"
+        set :asset_env, "RAILS_GROUPS=assets"
+    DESC
+    task :precompile, :roles => :web, :except => { :no_release => true } do
+      run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:precompile"
+    end
+
+    desc <<-DESC
+      Run the asset clean rake task. Use with caution, this will delete \
+      all of your compiled assets. You can specify the full path \
+      to the rake executable by setting the rake variable. You can also \
+      specify additional environment variables to pass to rake via the \
+      asset_env variable. The defaults are:
+
+        set :rake,      "rake"
+        set :rails_env, "production"
+        set :asset_env, "RAILS_GROUPS=assets"
+    DESC
+    task :clean, :roles => :web, :except => { :no_release => true } do
+      run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:clean"
+    end
+  end
+end
+end

data/lib/deprec/capistrano_extensions.rb

@@ -390,16 +390,6 @@ module Deprec2
     end
   end
 
-  # deprecated...I don't see any need for this
-  # Set the value if not already set
-  # This method is accessible to all recipe files
-  def self.default(name, *args, &block)
-    puts "********** deprecation warning **********"
-    puts "Could you use set() instead of default()?"
-    puts "*****************************************"
-    set(name, *args, &block) unless exists?(name)
-  end
-
   private
 
   ##

data/lib/deprec/rake.rb

@@ -0,0 +1,10 @@
+$VERBOSE = nil
+
+# Load deprec rakefile extensions
+%w(
+  db
+  environments
+).each do |task|
+  load File.join(File.dirname(__FILE__), 'rake', "#{task}.rake")
+end
+

data/lib/deprec/rake/db.rake

@@ -0,0 +1,37 @@
+require 'find'
+namespace :deprec do
+
+  namespace :db do
+
+    # Task written by Craig Ambrose <craigambrose.com>
+    desc "Backup the database to a file. Options: DIR=backup_dir RAILS_ENV=production MAX=20" 
+    task :backup => :environment do
+      unless defined? RAILS_ENV
+        RAILS_ENV = ENV['RAILS_ENV'] ||= 'development'
+      end
+      max_backups = (ENV['MAX'] || 20).to_i
+      datestamp = Time.now.strftime("%Y%m%d-%H%M%S")    
+      backup_dir = ENV['DIR'] || "db/backups"
+      backup_file = File.join(backup_dir, "#{RAILS_ENV}-#{datestamp}.sql.gz")    
+      FileUtils.mkdir_p(backup_dir)
+      db_config = ActiveRecord::Base.configurations[RAILS_ENV]    
+      pass = ''
+      pass = '-p' + db_config['password'] if db_config['password']
+      sh "mysqldump -u #{db_config['username']} #{pass} #{db_config['database']} -Q --add-drop-table -O add-locks=FALSE -O lock-tables=FALSE | gzip -c > #{backup_file}"     
+      puts "Created backup: #{backup_file}"     
+      dir = Dir.new(backup_dir)
+      all_backups = dir.entries[2..-1].sort.reverse
+      unwanted_backups = all_backups[max_backups..-1] || []
+      for unwanted_backup in unwanted_backups
+        FileUtils.rm_rf(File.join(backup_dir, unwanted_backup))
+        puts "deleted #{unwanted_backup}" 
+      end
+      puts "Deleted #{unwanted_backups.length} backups, #{all_backups.length - unwanted_backups.length} backups available" 
+    end
+
+    desc "Restore database"
+    task :restore => :environment do
+    end
+
+  end
+end

data/lib/deprec/rake/environments.rake

@@ -0,0 +1,9 @@
+# This coolness is from Chris Wanstrath
+# http://errtheblog.com/posts/31-rake-around-the-rosie
+
+%w(development production staging testing).each do |env|
+  desc "Runs the following task in the #{env} environment" 
+  task env.to_sym do
+    RAILS_ENV = ENV['RAILS_ENV'] = env
+  end
+end

data/lib/deprec/recipes/deprec.rb

@@ -3,11 +3,18 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   # Set the value if not already set
   # This method is accessible to all recipe files
-  def self.default(name, *args, &block)
+  # Defined and used by capistrano/deploy tasks
+  def _cset(name, *args, &block)
     unless exists?(name)
       set(name, *args, &block)
     end
   end
+
+  # deprecated
+  alias :default :_cset
+
+  # _cset :rake, 'rake'
+  _cset :rake, 'rakes'
   
   # Deprec checks here for local versions of config templates before it's own
   set :local_template_dir, File.join('config','templates')

data/lib/deprec/recipes/passenger.rb

@@ -19,6 +19,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :passenger_pool_idle_time, 300
       set :passenger_rails_autodetect, 'on'
       set :passenger_rails_spawn_method, 'smart' # smart | conservative
+      set :passenger_redirect_to_canonical_hostname, true
+      set(:passenger_server_alii) {
+        if domain =~ /^www\./
+          domain.sub 'www.', ''
+        else
+          "www.#{domain}"
+        end
+      }
 
       desc "Install Passenger"
       task :install, :roles => :app do

data/lib/deprec/recipes/users.rb

@@ -3,13 +3,25 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do
     namespace :users do
 
-      set(:users_target_user) { Capistrano::CLI.ui.ask "Enter userid" do |q| q.default = current_user; end }
-      set(:users_target_group) { Capistrano::CLI.ui.ask "Enter group name for new user" do |q| q.default = 'deploy'; end }
-      set(:users_make_admin) { Capistrano::CLI.ui.ask "Should this be an admin account?" do |q| q.default = 'no'; end }
+      set(:users_target_user) { 
+        Capistrano::CLI.ui.ask "Enter userid" do |q| 
+          q.default = current_user; 
+        end 
+      }
+      set(:users_target_group) { 
+        Capistrano::CLI.ui.ask "Enter group name for new user" do |q| 
+          q.default = users_target_user; 
+        end 
+      }
+      set(:users_make_admin) { 
+        Capistrano::CLI.ui.ask "Should this be an admin account?" do |q| 
+          q.default = 'no'; 
+        end 
+      }
       
       desc "Create account"
       task :add do
-        [users_target_user, users_make_admin] # get input
+        [users_target_user, users_target_group, users_make_admin] # get input
         new_password = get_new_password
 
         # Grab a list of all users with keys
@@ -19,7 +31,8 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         Array(users_target_user).each do |user| 
         
-          deprec2.useradd(user, :shell => '/bin/bash')
+          deprec2.groupadd(users_target_group)
+          deprec2.useradd(user, :group => group, :shell => '/bin/bash')
           deprec2.invoke_with_input("passwd #{user}", /UNIX password/, new_password)
         
           if users_make_admin.match(/y/i)

data/lib/deprec/templates/haproxy/haproxy.cfg.erb

@@ -10,13 +10,16 @@ global
       pidfile /var/run/haproxy.pid
       daemon
 
+
 defaults
-      option forwardfor
+      # Stats page at /haproxy?stats
       stats enable
-      stats auth myuser:mypass
-      balance roundrobin
-      option httpclose
+      stats auth admin:secret
+
       mode http
+      option forwardfor  # Adds X-Forwarded-For header to http reqs
+      option httpclose   # Needed for forwardfor
+      balance roundrobin
       retries 3
       option redispatch
       maxconn 2000
@@ -24,8 +27,23 @@ defaults
       clitimeout 50000
       srvtimeout 50000
 
-listen example_lb *:81
+
+frontend web *:80
+
+      acl www      hdr_beg(host) -i www
+
+      acl ip_local src 192.168.0.0/24
+
+      use_backend example_lb if www ip_local
+
+      default_backend localhost
+
+
+backend example_lb
       option httpchk HEAD /check.txt HTTP/1.0
       server web1 127.0.0.1:80 weight 6  maxconn 12 check # cookie A 
       server web2 127.0.0.1:80 weight 10 maxconn 12 check # cookie B
 
+
+backend localhost
+      server LOCALHOST 127.0.0.1:80

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

@@ -1,28 +1,52 @@
-# Don't cause the server to break if Passenger module not loaded
-<IfModule passenger_module>
-	<VirtualHost *:80>
-	  ServerName <%= domain %>
-      <%- 4.times do |counter| -%>
-        ServerAlias <%= domain.sub(/.*?\./, "assets#{counter}.") %>
-      <%- end %>
-	  DocumentRoot "<%= passenger_document_root %>"
-	  CustomLog <%= apache_log_dir %>/<%= application %>-access.log combined
-	  ErrorLog <%= apache_log_dir %>/<%= application %>-error.log
+<IfModule passenger_module> 
+    <VirtualHost *:80>
+
+        ServerName <%= domain %>
+        <%- Array(passenger_server_alii).each do |server_alias| -%>
+        ServerAlias <%= server_alias %>
+        <%- end -%>
+
+        <%- if passenger_redirect_to_canonical_hostname -%>
+        # Redirect to canonical hostname
+        RewriteEngine On
+        RewriteCond %{HTTP_HOST}    !^<%= domain.gsub('.','\.') %> [NC]
+        RewriteCond %{HTTP_HOST}    !^$
+        RewriteRule ^/?(.*)         http://<%= domain %>/$1 [L,R=301,NE]
+        <%- end -%>
+
+        DocumentRoot <%= passenger_document_root %>
+        <Directory <%= passenger_document_root %>>
+            Allow from all
+            Options -MultiViews
+        </Directory>
+
+        CustomLog <%= apache_log_dir %>/<%= application %>-access.log combined
+        ErrorLog <%= apache_log_dir %>/<%= application %>-error.log
 	  
-	  RackEnv <%= rack_env %>
-	  RailsEnv <%= rack_env %>
-	  # RailsAllowModRewrite <%= passenger_rails_allow_mod_rewrite %>
-	  #
-	  # Check for maintenance file and redirect all requests
-	  RewriteEngine On
-	  RewriteCond %{REQUEST_URI} !\.(css|jpg|png|gif)$
-	  RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
-	  RewriteCond %{SCRIPT_FILENAME} !maintenance.html
-      RewriteRule ^.*$ /system/maintenance.html [L]
-	  <Directory "<%= passenger_document_root %>">
-	    Order allow,deny
-	    Allow from all
-	  </Directory>
-	</VirtualHost>
-</IfModule>
+        RackEnv <%= rack_env %>
+        RailsEnv <%= rack_env %>
+
+        # Enable caching of assets containing a fingerprint
+        # Browsers need never check for newer versions of an
+        # asset because the fingerprint would be different.
+        <FilesMatch "/assets/[^.]+-[a-z0-9]{32}\.">
+            # Add far-future expiration dates
+            <IfModule mod_expires.c>
+                ExpiresActive On
+                ExpiresDefault "access plus 10 years"
+            </IfModule>
+            # Disable ETags
+            <IfModule mod_expires.c>
+                Header unset "ETag"
+            </IfModule>
+        </FilesMatch>
 
+        # Check for maintenance file and redirect all requests
+        RewriteEngine On
+        RewriteCond %{REQUEST_URI} !\.(css|jpg|png|gif)$
+        RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
+        RewriteCond %{SCRIPT_FILENAME} !maintenance.html
+        RewriteRule ^.*$ /system/maintenance.html [L]
+
+    </VirtualHost>
+</IfModule>

metadata

@@ -2,7 +2,7 @@
 name: deprec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Mike Bailey
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-10 00:00:00 Z
+date: 2011-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -59,6 +59,8 @@ files:
 - docs/nagios.txt
 - lib/deprec_cmd_completion.sh
 - lib/deprec_minus_rails.rb
+- lib/deprec/rake.rb
+- lib/deprec/TODO.txt
 - lib/deprec/recipes.rb
 - lib/deprec/capistrano_extensions.rb
 - lib/deprec/recipes/deprecated.rb
@@ -253,7 +255,10 @@ files:
 - lib/deprec/templates/bash/bash_global
 - lib/deprec/templates/ddclient/ddclient.erb
 - lib/deprec/templates/ddclient/ddclient.conf.erb
+- lib/deprec/callbacks/asset_pipeline.rb
 - lib/deprec/recipes_minus_rails.rb
+- lib/deprec/rake/db.rake
+- lib/deprec/rake/environments.rake
 - lib/vmbuilder_plugins/all.rb
 - lib/vmbuilder_plugins/apt.rb
 - lib/vmbuilder_plugins/emerge.rb