magic_recipes_two 0.0.11 → 0.0.12
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: aa137c4515fc5819d6bb15c06212d1b6103a5230
|
4
|
+
data.tar.gz: 225456ee970dc4ce125c846267c3ccea75759892
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 681244493eb108c0c28ecdc4d139cf4f2ea9256c22a72ca470da5f9c9c728b80376263d87e424dd00fd49ffe91f1865f2e5bdbe1be523f64f4ae8c77589ee863
|
7
|
+
data.tar.gz: 09cd5e45a5000b5c6d6ea62cb1f5ef0a4239fb19c19d33bfe77b8a4569dbbf766be6436120b08d40815f28202b1ce4617803b29f0561a9626364f7e262b0b44b
|
@@ -65,6 +65,8 @@ server {
|
|
65
65
|
<% end %>
|
66
66
|
|
67
67
|
<% if fetch(:nginx_major_domain) %>
|
68
|
+
<% if fetch(:nginx_use_ssl) %>
|
69
|
+
# ssl-domain
|
68
70
|
server {
|
69
71
|
listen 443;
|
70
72
|
server_name <%= Array(fetch(:nginx_domains)).map{ |d| d.gsub(/^\*?\./, "") }.join("\n ") %>;
|
@@ -73,6 +75,7 @@ server {
|
|
73
75
|
ssl_certificate <%= fetch(:nginx_ssl_certificate_path) %>/<%= fetch(:nginx_old_ssl_certificate) %>;
|
74
76
|
ssl_certificate_key <%= fetch(:nginx_ssl_certificate_key_path) %>/<%= fetch(:nginx_old_ssl_certificate_key) %>;
|
75
77
|
}
|
78
|
+
# ssl-with-subdomain
|
76
79
|
server {
|
77
80
|
listen 443;
|
78
81
|
server_name <%= Array(fetch(:nginx_domains)).map{ |d| "~^(?<sub>\w+)\.#{ Regexp.escape( d.gsub(/^\*?\./, "") ) }" }.join("\n ") %>;
|
@@ -81,6 +84,18 @@ server {
|
|
81
84
|
ssl_certificate <%= fetch(:nginx_ssl_certificate_path) %>/<%= fetch(:nginx_old_ssl_certificate) %>;
|
82
85
|
ssl_certificate_key <%= fetch(:nginx_ssl_certificate_key_path) %>/<%= fetch(:nginx_old_ssl_certificate_key) %>;
|
83
86
|
}
|
87
|
+
<% else %>
|
88
|
+
server {
|
89
|
+
listen 80;
|
90
|
+
server_name <%= Array(fetch(:nginx_domains)).map{ |d| d.gsub(/^\*?\./, "") }.join("\n ") %>;
|
91
|
+
return 301 http://<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri;
|
92
|
+
}
|
93
|
+
server {
|
94
|
+
listen 80;
|
95
|
+
server_name <%= Array(fetch(:nginx_domains)).map{ |d| "~^(?<sub>\w+)\.#{ Regexp.escape( d.gsub(/^\*?\./, "") ) }" }.join("\n ") %>;
|
96
|
+
return 301 http://$sub.<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri;
|
97
|
+
}
|
98
|
+
<% end %>
|
84
99
|
<% end %>
|
85
100
|
|
86
101
|
server {
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: magic_recipes_two
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.12
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Torsten Wetzel
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-02-
|
11
|
+
date: 2015-02-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|