magic_recipes_two 0.0.77 → 0.0.78

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWExNzJkMGUwNTBlODUyNDRjMzQ5NDRjYTBmYTg3Yzg2NWU1MGU2YQ==
+    YzI3NmM5NDQxMzY5ZGU3NGM2MzcyOTczZjZiNmMwZDYyZDhiNDNiMA==
   data.tar.gz: !binary |-
-    MDBlMjQyOTJkOTJmMmYyOTIyMzg0NTkzNDk4YmM1YWIwOGUxZWZhZQ==
+    NWJkMWU3ZjMzZDkxNGIyZmI2MjEzMmM4ODIyMmZjYzhjZDJkOWM5OA==
 SHA512:
   metadata.gz: !binary |-
-    NzA0Nzc5YmYxNmMzMGM3ODE2ZDJlYTZhOWM4NmY1NTFhYzBhZjIxNGM1YmQ2
-    ZWY0MzdmNGFhZmYxM2YxOGM5NTRlM2NmYzk2YjZjMDA3MWY3OGY5OTA0NDA1
-    MmJjYTM5MGExZmNiMzUwMjFiMzc1MzU2NWI5NzcwY2I3ZjljNGU=
+    ZDdmNGMxOTM2YzMwZGEzNWI3MzUwN2M1ZTkxMjcwNWQwOThmMGY1ZTlmOTRj
+    YTM3ZjQ1M2IzNzkxMTA1Y2JmM2UzNzBjNmNjZDQwNWUwZTU3ZGY2NDJiYjc3
+    ZmQ3ZGI3YmExZDUyNzA0OTEwYWMxNjg2NzYwMzBiODQ0Nzk3MTE=
   data.tar.gz: !binary |-
-    NzA3NDcyNDI5ZmE4YjAzMzc0OTVmYjc5OTBlNmE1MjRkYzFkOGNkMzM5ZmU0
-    YmU5NzI2ZmVhZDY0ZjAzYzk1YmExMzBjYjk4MDE3MmVmMzI1NjAyY2U2MDhl
-    YjNhMGZkYzZlZmM4ZTA3YjkzYTJmYjdiMTFjN2QzNjE3MjZkYzU=
+    ZDAzOGU5Y2VhM2FiNzE1OWI2ZThjNzUyY2NhYWVmYzkwZTY4YTVmYzJkZDM5
+    NDNkNTA4ODcyZjUwM2RiZGE4OTI4MDA2YjFiZDgzYjIwM2FjZGJjNmUzNzhi
+    NzQ3MTVkYjJiY2Q5ODhjY2JiNzc5NzlmNjFlNWVjYmMyMGMxODk=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.77"
+    VERSION = "0.0.78"
   end
 end

data/lib/capistrano/tasks/nginx.rake

@@ -7,6 +7,7 @@ namespace :load do
     set :nginx_domains,               -> { [] }
     set :nginx_major_domain,          -> { false }
     set :nginx_domain_wildcard,       -> { false }
+    set :nginx_redirect_subdomains,   -> { false }
     set :nginx_remove_www,            -> { true }
     set :default_site,                -> { false }
     set :app_instances,               -> { 1 }
@@ -162,6 +163,21 @@ namespace :nginx do
       fetch(:nginx_major_domain, false) ? clear_domain( fetch(:nginx_major_domain) ) : false
     end
     
+    def nginx_all_domains_with_www
+      domains = []
+      nginx_domains.each do |domain|
+        domains << domain
+        domains << "www.#{domain}"  unless  domain =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
+        domains << ".#{domain}"     if      fetch(:nginx_domain_wildcard, false)
+      end
+      if nginx_major_domain
+        domains << nginx_major_domain
+        domains << "www.#{nginx_major_domain}"  unless  nginx_major_domain =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
+        domains << ".#{nginx_major_domain}"     if      fetch(:nginx_domain_wildcard, false)
+      end
+      domains
+    end
+    
     
     desc 'Creates the site configuration and upload it to the available folder'
     task :add => ['nginx:load_vars'] do

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

@@ -17,23 +17,27 @@ upstream thin_<%= fetch(:application) %>_<%= fetch(:stage) %>_cluster {
 <% if fetch(:nginx_major_domain) %>
 server {
   listen                80<%= ' default_server' if fetch(:default_site) %>;
-  server_name           <%= nginx_domains_with_www.join(joiner) %>
-                        <%= nginx_major_domain %>;
+  server_name           <%= nginx_all_domains_with_www.join(joiner) %>;
   return 301 https://<%= nginx_major_domain %>$request_uri;
   
 }
+<% if fetch(:nginx_redirect_subdomains, false) %>
+# server with subdomain
 server {
   listen 80;
   server_name           <%= nginx_domains.map{ |d| subdomain_regex(d) }.join(joiner) %>
                         <%= subdomain_regex( nginx_major_domain ) %>;
   return 301 https://$sub.<%= nginx_major_domain %>$request_uri;
 }
+<% end %>
 <% else %>
 server {
   listen                80;
-  server_name           <%= nginx_domains_with_www.join(joiner) %>;
+  server_name           <%= nginx_all_domains_with_www.join(joiner) %>;
   return 301 https://$host$request_uri;
 }
+<% if fetch(:nginx_redirect_subdomains, false) %>
+# server with subdomain
 server {
   listen                80;
   server_name           <%= nginx_domains.map{ |d| subdomain_regex(d) }.join(joiner) %>
@@ -41,6 +45,7 @@ server {
 }
 <% end %>
 <% end %>
+<% end %>
 
 <% if fetch(:nginx_major_domain) %>
 <% if fetch(:nginx_use_ssl) %>
@@ -55,6 +60,7 @@ server {
   
   return 301 https://<%= nginx_major_domain %>$request_uri;
 }
+<% if fetch(:nginx_redirect_subdomains, false) %>
 # ssl-with-subdomain
 server {
   listen                443;
@@ -66,12 +72,14 @@ server {
   
   return 301 https://$sub.<%= nginx_major_domain %>$request_uri;
 }
+<% end %>
 <% else %>
 server {
   listen                80;
   server_name           <%= nginx_domains_with_www.join(joiner) %>;
   return 301 http://<%= nginx_major_domain %>$request_uri;
 }
+<% if fetch(:nginx_redirect_subdomains, false) %>
 server {
   listen                80;
   server_name           <%= nginx_domains.map{ |d| subdomain_regex(d) }.join(joiner) %>;
@@ -79,6 +87,7 @@ server {
 }
 <% end %>
 <% end %>
+<% end %>
 
 
 server {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.77
+  version: 0.0.78
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails