easy-deployment 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog for easy-deployment
 
+## 0.5.2 (2013-08-20)
+
+Bugfixes:
+
+* Fix misplaced comments in the default `apache.conf` template that this library generates
+
+New Features:
+
+* Added support for rails asset caching in apache.conf template (provided expires module is enabled)
+* Added links to further documentation on passenger VirtualHost patterns to the github wiki
+
 ## 0.5.1 (2013-05-27)
 
 Bugfixes:
@@ -15,7 +26,7 @@ New Features:
 * Apache/passenger config template now sets `PassengerMinInstances` and provides some disabled example tuning options
 * Specified license in the gemspec
 
-## 0.5.0 - 2013-04-05
+## 0.5.0 (2013-04-05)
 
 Large rewrite of both templates, and generator code.
 
@@ -35,32 +46,32 @@ Bug Fixes:
 * `deploy.rb` and `staging.rb` etc files are rendered correctly as templates, instead of copied over without rendering
 * use `deploy:create_symlink` instead of deprecated `deploy:symlink`
 
-## 0.4.4 - 2013-01-11
+## 0.4.4 (2013-01-11)
 
 Bug Fixes:
 
 * Bugfix for previous niet role definition, variable should be delayed being evaluated
 
-## 0.4.3 - 2013-01-10
+## 0.4.3 (2013-01-10)
 
 Enhancements:
 
 * the server role for the niet tasks are now configurable via `set :niet_roles, [:job]`
 
-## 0.4.2 - 2013-01-09
+## 0.4.2 (2013-01-09)
 
 Enhancements:
 
 * path to the binary apachectl command is now able to be configured via `set :apachectl_bin`
 * Added documentation to README.md for several of the optional features
 
-## 0.4.1 - 2012-12-10
+## 0.4.1 (2012-12-10)
 
 Bug Fixes:
 
 * raise exception if `cap niet:start` is run without `cap niet:setup` being run first
 
-## 0.4.0 - 2012-11-19
+## 0.4.0 (2012-11-19)
 
 Enhancements:
 
@@ -68,19 +79,19 @@ Enhancements:
 * apache:configure task now copies a folder stage/apache/* if present falling back to previous state/apache.conf
 * added `easy/deployment/performance` optional require to track the times of deployments
 
-## 0.3.3 - 2012-10-16
+## 0.3.3 (2012-10-16)
 
 Bug Fixes
 
 * `deploy:reference` should use the rails_env, not the stage
 
-## 0.3.0 - 2012-09-04
+## 0.3.0 (2012-09-04)
 
 Enhancements:
 
 * Add `apache:configure_and_reload` capistrano task, which will configure the site, test the configuration & gracefully reload the Apache configuration
 
-## 0.2.2 - 2012-08-27
+## 0.2.2 (2012-08-27)
 
 Enhancements:
 

data/README.md

@@ -48,12 +48,14 @@ If necessary, you can set the path to the apache2ctl binary via:
 
     set :apachectl_bin, "/usr/sbin/apachectl"
 
-This assumes your deploy user has access to run the apachectl command with sudo privileges. As a recommended security practice, your deploy user should not have general sudo access, instead configure limited sudo access for specific commands only, declaring the full binary path
+This assumes your deploy user has access to run the apachectl command with sudo privileges. As a recommended security practice, your deploy user should not have general sudo access, instead configure limited sudo access for specific commands only, declaring the full binary path. Having passwordless sudo *only* for these limited commands can make this smoother, but is not a requirement - capistrano will prompt for sudo password if that is required.
 
     # Example sudoers file entries to grant deploy user passwordless sudo privileges to only these commands
     deploy ALL=(ALL) NOPASSWD:/usr/sbin/apachectl graceful
     deploy ALL=(ALL) NOPASSWD:/usr/sbin/apachectl configtest
 
+Read more about passenger configuration on our wiki at https://github.com/AbleTech/easy-deployment/wiki/Common-passenger-config
+
 ### Logrotate
 
 Automatically configure logrotate for your application logfile:

data/lib/easy-deployment/version.rb

@@ -1,5 +1,5 @@
 module Easy
   module Deployment
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/lib/easy/generators/deployment_generator.rb

@@ -36,6 +36,14 @@ TODO:
         say("  * Set the ip address for staging in config/deploy/#{stage}.rb && the apache config in config/deploy/#{stage}/apache.conf", :green)
       end
 
+      add_optional_operational_gems
+
+      true
+    end
+
+    private
+
+    def add_optional_operational_gems
       needs_bundle = false
 
       unless options[:disable_newrelic]
@@ -55,8 +63,6 @@ TODO:
       end
 
       bundle_command(:install) if needs_bundle
-
-      true
     end
 
   end

data/lib/easy/generators/templates/stage/apache.conf.tt

@@ -1,3 +1,6 @@
+# Read more about different configurations for Apache/passenger at https://github.com/AbleTech/easy-deployment/wiki/Common-passenger-config
+# TODO: customize this config file prior to deploying
+
 <VirtualHost *:80>
   ServerName <%= name %>.<%= application_name %>.co.nz
 
@@ -5,12 +8,28 @@
   RackEnv <%= name %>
 
   # Passenger tuning
-  PassengerMinInstances 1 # Prevent passenger going to sleep after 15min inactivity
-  # PassengerPreStart http://<%= name %>.<%= application_name %>.co.nz # Pre-load app on deploy. This needs to match the ServerName above
-  # PassengerHighPerformance on # If you don't need any apache mods within this VirtualHost, you may turn this on
+  # at least 1 prevents passenger going to sleep after 15min inactivity, increase as desired
+  PassengerMinInstances 1
+  # Pre-load app on deploy. This needs to match the ServerName above
+  # PassengerPreStart http://<%= name %>.<%= application_name %>.co.nz
+  # If you don't need any apache mods within this VirtualHost, you may turn high performance mode on
+  # PassengerHighPerformance on
 
   <Directory /var/apps/<%= application_name %>/current/public>
      AllowOverride all
      Options -MultiViews
   </Directory>
+
+  # Rails asset caching - will only be enabled if 'expires' module is enabled.
+  <IfModule expires_module>
+    <Location /assets/>
+      # Use of ETag is discouraged when Last-Modified is present
+      Header unset ETag
+      FileETag None
+      # RFC says only cache for 1 year
+      ExpiresActive On
+      ExpiresDefault "access plus 1 year"
+    </Location>
+  </IfModule>
+
 </VirtualHost>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-deployment
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,3 +149,4 @@ summary: Gem for encapsulating Abletech's deployment practices
 test_files:
 - spec/easy_deployment_spec.rb
 - spec/spec_helper.rb
+has_rdoc: