recipiez 0.8.3 → 0.8.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,3 @@
1
1
  module Recipiez
2
- VERSION = '0.8.3'
2
+ VERSION = '0.8.4'
3
3
  end
data/recipes/apache.rb CHANGED
@@ -38,6 +38,10 @@ Capistrano::Configuration.instance(true).load do
38
38
  unless exists? :ssl
39
39
  set :ssl, 'off'
40
40
  end
41
+
42
+ unless exists? :ssl_redirect_elb
43
+ set :ssl_redirect_elb, "off"
44
+ end
41
45
 
42
46
 
43
47
  logger.info "generating .conf file"
@@ -9,6 +9,12 @@ ErrorLog /var/log/apache2/<%= app_domain %>-error.log
9
9
 
10
10
  DocumentRoot <%= deploy_to %>/current/public
11
11
 
12
+ <% if ssl_redirect_elb == 'on' %>
13
+ RewriteEngine on
14
+ RewriteCond %{HTTP:X-Forwarded-Proto} !https
15
+ RewriteRule ^.*$ https://%{SERVER_NAME}%{REQUEST_URI}
16
+ <% end %>
17
+
12
18
  <Directory <%= deploy_to %>/current/public>
13
19
  AllowOverride all
14
20
  Require all granted
@@ -26,6 +32,8 @@ DocumentRoot <%= deploy_to %>/current/public
26
32
  </VirtualHost>
27
33
 
28
34
 
35
+
36
+
29
37
  <% if ssl == 'on' %>
30
38
 
31
39
  <VirtualHost *:443>
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 8
8
- - 3
9
- version: 0.8.3
8
+ - 4
9
+ version: 0.8.4
10
10
  platform: ruby
11
11
  authors:
12
12
  - Alastair Brunton
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2015-06-08 00:00:00 +02:00
17
+ date: 2015-08-10 00:00:00 +01:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency