recipiez 0.8.3 → 0.8.4

data/lib/recipiez/version.rb

@@ -1,3 +1,3 @@
 module Recipiez
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/recipes/apache.rb

@@ -38,6 +38,10 @@ Capistrano::Configuration.instance(true).load do
       unless exists? :ssl
         set :ssl, 'off'
       end
+      
+      unless exists? :ssl_redirect_elb
+        set :ssl_redirect_elb, "off"
+      end
 
 
       logger.info "generating .conf file"

data/recipes/templates/php_vhost.erb

@@ -9,6 +9,12 @@ ErrorLog      /var/log/apache2/<%= app_domain %>-error.log
 
 DocumentRoot <%= deploy_to %>/current/public
 
+<% if ssl_redirect_elb == 'on' %>
+RewriteEngine on
+RewriteCond %{HTTP:X-Forwarded-Proto} !https
+RewriteRule ^.*$ https://%{SERVER_NAME}%{REQUEST_URI}
+<% end %>
+
 <Directory <%= deploy_to %>/current/public>
   AllowOverride all
   Require all granted
@@ -26,6 +32,8 @@ DocumentRoot <%= deploy_to %>/current/public
 </VirtualHost>
 
 
+
+
 <% if ssl == 'on' %>
 
 <VirtualHost *:443>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Alastair Brunton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-06-08 00:00:00 +02:00
+date: 2015-08-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency