deprec 3.1.0.rc11 → 3.1.0.rc12

data/CHANGELOG

@@ -1,6 +1,10 @@
 deprec changelog
 ================
 
+= 3.1.0.rc12  (Jul 22, 2011)
+
+  * Added TEMPLATE_LOAD_PATH so deprec-core can locate templates
+
 = 3.1.0.rc11  (Jul 18, 2011)
 
   * require 'deprec-core' from each recipe so they can be loaded individually.

data/lib/deprec.rb

@@ -1,4 +1,9 @@
+TEMPLATE_LOAD_PATH = []
+TEMPLATE_LOAD_PATH << File.expand_path(
+  File.join(File.dirname(__FILE__),'deprec','templates')
+)
 require 'deprec-core'
+
 if defined?(Capistrano)
   Dir.glob("#{File.dirname(__FILE__)}/deprec/recipes/*.rb").each { |t| require t }
 elsif defined?(Rake)

data/lib/deprec/recipes/example.rb

@@ -83,19 +83,19 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       
       task :start, :roles => :web do
-        send(run_method, "/etc/init.d/example reload")
+        run "#{sudo} /etc/init.d/example reload"
       end
       
       task :stop, :roles => :web do
-        send(run_method, "/etc/init.d/example reload")
+        run "#{sudo} /etc/init.d/example reload"
       end
       
       task :restart, :roles => :web do
-        send(run_method, "/etc/init.d/example restart")
+        run "#{sudo} /etc/init.d/example restart"
       end
       
       task :reload, :roles => :web do
-        send(run_method, "/etc/init.d/example reload")
+        run "#{sudo} /etc/init.d/example reload"
       end
       
       task :activate, :roles => :web do
@@ -112,4 +112,4 @@ Capistrano::Configuration.instance(:must_exist).load do
       
     end
   end
-end
+end

data/lib/deprec/recipes/ssh.rb

@@ -40,22 +40,22 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Start ssh"
       task :start do
-        send(run_method, "/etc/init.d/ssh reload")
+        run "#{sudo} /etc/init.d/ssh reload"
       end
     
       desc "Stop ssh"
       task :stop do
-        send(run_method, "/etc/init.d/ssh reload")
+        run "#{sudo} /etc/init.d/ssh reload"
       end
     
       desc "Restart ssh"
       task :restart do
-        send(run_method, "/etc/init.d/ssh restart")
+        run "#{sudo} /etc/init.d/ssh restart"
       end
     
       desc "Reload ssh"
       task :reload do
-        send(run_method, "/etc/init.d/ssh reload")
+        run "#{sudo} /etc/init.d/ssh reload"
       end
       
       desc "Sets up authorized_keys file on remote server"
@@ -104,7 +104,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         # copy keys to remote server
         deprec2.mkdir "/home/#{target_user}/.ssh", :mode => 0700, :owner => "#{target_user}.users", :via => :sudo
         std.su_put keys, "/home/#{target_user}/.ssh/authorized_keys", '/tmp/', :mode => 0600
-        sudo "chown #{target_user}.users /home/#{target_user}/.ssh/authorized_keys"
+        run "#{sudo} chown #{target_user}.users /home/#{target_user}/.ssh/authorized_keys"
       end
 
     end

data/lib/deprec/recipes/ubuntu.rb

@@ -34,6 +34,17 @@ Capistrano::Configuration.instance(:must_exist).load do
         sudo "rm /var/lib/apt/lists/lock"
         # XXX There's one more - add it!
       end
+
+      desc "Remove consolekit"
+      task :remove_consolekit, :roles => :ubuntu do
+        run "#{sudo} apt-get remove consolekit"
+        run "#{sudo} apt-get remove dbus"
+      end
+
+      desc "Remove crap that doesn't belong on a server"
+      task :trim, :roles => :ubuntu do
+        remove_consolekit
+      end
       
     end
   end

data/lib/deprec/recipes/users.rb

@@ -32,7 +32,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         Array(users_target_user).each do |user| 
         
           deprec2.groupadd(users_target_group)
-          deprec2.useradd(user, :group => group, :shell => '/bin/bash')
+          deprec2.useradd(user, :group => users_target_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/bash/bash_global

@@ -34,3 +34,5 @@ alias tc='time curl -s -o /dev/null'
 
 # Load rubygems
 alias irb="irb -I '.' -rubygems"
+
+alias ssm="ssh -l $USER"

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

@@ -29,17 +29,19 @@
         # 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>
+        <Directory <%= passenger_document_root %>/public/assets>
+          <FilesMatch "[^.]+-[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_headers.c>
+                  Header unset "ETag"
+              </IfModule>
+            </FilesMatch>
+        </Directory>
 
         # Check for maintenance file and redirect all requests
         RewriteEngine On

data/lib/deprec/version.rb

@@ -1,3 +1,3 @@
 module Deprec
-  VERSION = "3.1.0.rc11"
+  VERSION = "3.1.0.rc12"
 end

metadata

@@ -1,59 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: deprec
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.1.0.rc12
   prerelease: 6
-  version: 3.1.0.rc11
 platform: ruby
-authors: 
+authors:
 - Mike Bailey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-22 00:00:00.000000000 +10:00
+default_executable: depify
+dependencies:
+- !ruby/object:Gem::Dependency
   name: deprec-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &11350820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *11350820
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &11350280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: capistrano-ext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *11350280
+- !ruby/object:Gem::Dependency
+  name: capistrano-ext
+  requirement: &11349820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
-  version_requirements: *id003
-description: "      This project provides Capistrano and Rake tasks to \n      assist with deployment and configuration management\n      on ubuntu linux servers.\n"
+  prerelease: false
+  version_requirements: *11349820
+description: ! "      This project provides Capistrano and Rake tasks to \n      assist
+  with deployment and configuration management\n      on ubuntu linux servers.\n"
 email: mike@bailey.net.au
-executables: 
+executables:
 - depify
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/hosts.rb
 - bin/depify
 - docs/TODO.txt
@@ -239,32 +238,29 @@ files:
 - LICENSE
 - README.md
 - THANKS
+has_rdoc: true
 homepage: http://deprec.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: deprec
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: deployment recipes for capistrano
 test_files: []
-