magic_recipes_two 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d8b1d3b1862fb1353b9e98471a06727f02455a1
-  data.tar.gz: 3b297e4a7e94300cee969c6e54f9e26b143d09bf
+  metadata.gz: aa137c4515fc5819d6bb15c06212d1b6103a5230
+  data.tar.gz: 225456ee970dc4ce125c846267c3ccea75759892
 SHA512:
-  metadata.gz: 605cbc4bd43a465428f72330c6544f63b3903e8563ec46b1f568a19838f82003926fa0ebc32faf2ee2892215b32409417a1971ac62df770d7b3ba58bb6e1c145
-  data.tar.gz: 3664339f6886a4116f4e484ec878d52b5bacbf7a21a61ddc7c93ab3fb319e24422e7a1579433c93d83e4136dc1c7a84e6423b3ca6c1d653387019a495ee40545
+  metadata.gz: 681244493eb108c0c28ecdc4d139cf4f2ea9256c22a72ca470da5f9c9c728b80376263d87e424dd00fd49ffe91f1865f2e5bdbe1be523f64f4ae8c77589ee863
+  data.tar.gz: 09cd5e45a5000b5c6d6ea62cb1f5ef0a4239fb19c19d33bfe77b8a4569dbbf766be6436120b08d40815f28202b1ce4617803b29f0561a9626364f7e262b0b44b

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/lib/generators/capistrano/magic_recipes/templates/nginx.conf.erb

@@ -65,6 +65,8 @@ server {
 <% end %>
 
 <% if fetch(:nginx_major_domain) %>
+<% if fetch(:nginx_use_ssl) %>
+# ssl-domain
 server {
   listen 443;
   server_name <%= Array(fetch(:nginx_domains)).map{ |d| d.gsub(/^\*?\./, "") }.join("\n              ") %>;
@@ -73,6 +75,7 @@ server {
   ssl_certificate <%= fetch(:nginx_ssl_certificate_path) %>/<%= fetch(:nginx_old_ssl_certificate) %>;
   ssl_certificate_key <%= fetch(:nginx_ssl_certificate_key_path) %>/<%= fetch(:nginx_old_ssl_certificate_key) %>;
 }
+# ssl-with-subdomain
 server {
   listen 443;
   server_name <%= Array(fetch(:nginx_domains)).map{ |d| "~^(?<sub>\w+)\.#{ Regexp.escape( d.gsub(/^\*?\./, "") ) }" }.join("\n              ") %>;
@@ -81,6 +84,18 @@ server {
   ssl_certificate <%= fetch(:nginx_ssl_certificate_path) %>/<%= fetch(:nginx_old_ssl_certificate) %>;
   ssl_certificate_key <%= fetch(:nginx_ssl_certificate_key_path) %>/<%= fetch(:nginx_old_ssl_certificate_key) %>;
 }
+<% else %>
+server {
+  listen 80;
+  server_name <%= Array(fetch(:nginx_domains)).map{ |d| d.gsub(/^\*?\./, "") }.join("\n              ") %>;
+  return 301 http://<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri;
+}
+server {
+  listen 80;
+  server_name <%= Array(fetch(:nginx_domains)).map{ |d| "~^(?<sub>\w+)\.#{ Regexp.escape( d.gsub(/^\*?\./, "") ) }" }.join("\n              ") %>;
+  return 301 http://$sub.<%= fetch(:nginx_major_domain).gsub(/^\*?\./, "") %>$request_uri;
+}
+<% end %>
 <% end %>
 
 server {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails