le1t0-deprec 2.1.6.025 → 2.1.6.026

data/CHANGELOG

@@ -1,5 +1,10 @@
 # deprec changelog
 
+= 2.1.6.026 (Jul 19, 2010)
+
+* made passenger more configurable
+* fix in configuration output for haproxy
+
 = 2.1.6.025 (Jul 15, 2010)
 
 * bugfix for haproxy + fix user to run haproxy under

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

@@ -25,7 +25,15 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :passenger_rails_autodetect, 'on'
       set :passenger_rails_spawn_method, 'smart' # smart | conservative
       set :passenger_version, '2.2.11'
-      set :passenger_server_aliases, [ ]
+      set :passenger_server_aliases, [ ] # defaults to assets0-3.DOMAIN if nil, outputs no ServerAlias
+
+      set :passenger_apache_logging_config, nil # set to a string to override default logging config
+      set :passenger_rails_3, false
+      set :passenger_apache_deflate_html, false
+      set :passenger_apache_rewrite_config, nil # set to a string to override default rewrite config
+      set :passenger_apache_extra_config, nil # set this to a string to define extra apache options, not covered by the above
+      set :passenger_app_root, nil # set to a string to set an explicit path, set to false to disable the setting,
+                                   # defaults to parent dir of :passenger_document_root
 
       desc "Install passenger"
       task :install, :roles => :app do

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

@@ -8,7 +8,7 @@ global
       user <%= haproxy_user %>
       group <%= haproxy_group %>
 <% haproxy_global_options.each do |key, values| [values].flatten.each do |value| %>
-      <%= key %> <%= value %>
+      <%= key %><% if value && value != true  %> <%= value %><% end %>
 <% end end %>
 
 defaults
@@ -17,7 +17,7 @@ defaults
       stats <%= haproxy_default_options[:stats_auth] %>
 <% end %>
 <% (haproxy_default_options[:options] || {}).each do |key, values| [values].flatten.each do |value| %>
-      <%= key %> <%= value %>
+      <%= key %><% if value && value != true  %> <%= value %><% end %>
 <% end end %>
 
 <% haproxy_instances.each_with_index do |instance_ipport, i| %>
@@ -32,6 +32,6 @@ listen <%= instance[:name] || "no_name_defined_#{i+1}" %> <%= ipport %>
       stats <%= instance[:stats_auth] %>
 <% end %>
 <% (instance[:servers] || {}).each do |key, value| %>
-      <%= key %> <%= value %>
+      <%= key %><% if value && value != true  %> <%= value %><% end %>
 <% end %>
 <% end %>

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

@@ -2,28 +2,55 @@
 <IfModule passenger_module>
 	<VirtualHost *:80>
 	  ServerName <%= domain %>
-      <%- passenger_server_aliases.each do |server_alias| -%>
-        ServerAlias <%= server_alias %>
-      <%- end %>
+	  <% unless passenger_server_aliases.nil? %>
+      	<%- passenger_server_aliases.each do |server_alias| -%>
+      ServerAlias <%= server_alias %>
+      	<%- end %>
+	  <% else %>
+      	<%- 4.times do |counter| -%>
+      ServerAlias <%= domain.sub(/.*?\./, "assets#{counter}.") %>
+      	<%- end %>
+	  <% end %>
+
 	  DocumentRoot "<%= passenger_document_root %>"
+	  <% unless passenger_app_root == false %>
+	  PassengerAppRoot "<%= passenger_app_root || File.dirname(passenger_document_root) %>"
+	  <% end %>
+	
+	  <% if passenger_apache_logging_config %>
+	  <%= passenger_apache_logging_config %>
+	  <% else %>
 	  CustomLog <%= apache_log_dir %>/<%= application %>-access.log combined
 	  ErrorLog <%= apache_log_dir %>/<%= application %>-error.log
+	  <% end %>
 	  
-	  RailsEnv <%= rails_env %>
+	  <% if passenger_rails_3 %>
 	  RackEnv <%= rails_env %>
-	  # RailsAllowModRewrite <%= passenger_rails_allow_mod_rewrite %>
-	  #
-	  # Check for maintenance file and redirect all requests
+	  <% else %>
+	  RailsEnv <%= rails_env %>
+	  <% end %>
+
+      <% if passenger_apache_rewrite_config %>
+	  <%= passenger_apache_rewrite_config %>
+      <% else %>
 	  RewriteEngine On
 	  RewriteCond %{REQUEST_URI} !\.(css|jpg|png|gif)$
-	  # allow requests to server-status and server-info, might be needed if you use monitoring services like fiveruns
 	  RewriteCond %{REQUEST_URI} !server-(status|info)/?$
 	  RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
 	  RewriteCond %{SCRIPT_FILENAME} !maintenance.html
       RewriteRule ^.*$ /system/maintenance.html [L]
+      <% end %>
+
+      <% if passenger_apache_extra_config %>
+	  <%= passenger_apache_extra_config %>
+      <% end %>
+
 	  <Directory "<%= passenger_document_root %>">
 	    Order allow,deny
 	    Allow from all
+		<% if passenger_apache_deflate_html %>
+		AddOutputFilterByType DEFLATE text/html
+		<% end %>
 	  </Directory>
 	</VirtualHost>
 </IfModule>

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 1
   - 6
-  - 25
-  version: 2.1.6.025
+  - 26
+  version: 2.1.6.026
 platform: ruby
 authors: 
 - Le1t0
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2010-07-19 00:00:00 +02:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency