magic_recipes_two 0.0.24 → 0.0.25
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.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 43bc60f12d2140102af07f14cf233f3d5a975203
|
|
4
|
+
data.tar.gz: cb7eb36faa5db29025120f686360e59395bb132c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8039fbed053d5c12f08ad8372eb38220190b3838d7f2056944203847fc8eb37d197cce2c25833a32e05dc96d53c5b9fd3332737d088a32d2cd152a649347ead4
|
|
7
|
+
data.tar.gz: b32d3fd401e82133d0779e64adafb0f69d8a4c55c39decc35bce654b181b046ac2fe875a7095a312aea5739549dc7036a01c4b33d475b6d172c7a2f132caa95b
|
|
@@ -93,8 +93,8 @@ server {
|
|
|
93
93
|
server_name <%= Array(fetch(:nginx_domains)).map{ |d| d.gsub(/^\*?\./, "") }.join(joiner) %>
|
|
94
94
|
<%= ".#{fetch(:nginx_major_domain).gsub(/^\*?\./, "")}" %>;
|
|
95
95
|
|
|
96
|
-
return 301 http://<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri;
|
|
97
|
-
|
|
96
|
+
# return 301 http://<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri;
|
|
97
|
+
rewrite ^ http://<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri? permanent;
|
|
98
98
|
}
|
|
99
99
|
server {
|
|
100
100
|
listen 443;
|
|
@@ -102,14 +102,16 @@ server {
|
|
|
102
102
|
<%= "~^#{Regexp.escape("www.")}(?<sub>\w+)#{ Regexp.escape( ".#{fetch(:nginx_major_domain).gsub(/^\*?\./, "")}" ) }" %>
|
|
103
103
|
<%= "~^(?<sub>\w+)#{ Regexp.escape( ".#{fetch(:nginx_major_domain).gsub(/^\*?\./, "")}" ) }" %>;
|
|
104
104
|
|
|
105
|
-
return 301 http://$sub.<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri;
|
|
105
|
+
# return 301 http://$sub.<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri;
|
|
106
|
+
rewrite ^ http://$sub.<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri? permanent;
|
|
106
107
|
}
|
|
107
108
|
<% else %>
|
|
108
109
|
server {
|
|
109
110
|
listen 443;
|
|
110
111
|
server_name <%= Array(fetch(:nginx_domains)).map{ |d| d[0] == "." ? d : ".#{d}"}.join(joiner) %>;
|
|
111
112
|
|
|
112
|
-
return 301 http://$host$request_uri;
|
|
113
|
+
# return 301 http://$host$request_uri;
|
|
114
|
+
rewrite ^ http://$host$request_uri? permanent;
|
|
113
115
|
}
|
|
114
116
|
<% end %>
|
|
115
117
|
<% end %>
|