capistrano-unformatt 1.12 → 1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62db3552bb91176d87116f24390e209bc3af98d4
-  data.tar.gz: 94990c22a0be6d11cec874fdcf5969d3a7504bc1
+  metadata.gz: 4329f7a051b147dbf6f59aed989ee0a93729613e
+  data.tar.gz: 81e65998fdc812e4ec5e125112d16feb4a2e3d44
 SHA512:
-  metadata.gz: 4327260c468915b5f44e6c04e60b4e481c8aab7e27ff70404522d4a7012e1697e9dbb2b002b58f04b50449a771c6d26e52d38998c40c1a107894866fe1487d99
-  data.tar.gz: 4f16b58a250f1b8c96858c517d89d1e28e84bbefb587e11fb7770033050fc58d04876f3bde1c76ad9826d96bb6176cf476a6bc5e385f90fa9c91c4aa5b49af30
+  metadata.gz: 0c83a3251b8daefacd2b35d3f6eef1a0f822023da22e98f015661ff9588d373fc24627ff62e9f3cd51c80931e6d99b9d102f8afd8b3b32a13fdc0f032041b5fe
+  data.tar.gz: 333c3748b2db12fa8e5d7d52c520bd879a6e7157e8aba6f113e95345f5916ee9ac744dbdefd7c5c97e4081faa1b1ba798f6890f1af547b70f3fbc75caa8ce5c1

data/CHANGELOG.md

@@ -73,3 +73,7 @@
 ## v1.12
 
 * Replaced present method not working on strings
+
+## v1.13
+
+* Fix extra space on nginx conf template

data/capistrano-unformatt.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-unformatt"
-  spec.version       = '1.12'
+  spec.version       = '1.13'
   spec.authors       = ["unformatt"]
   spec.email         = ["unformatt@gmail.com"]
   spec.description   = "Custom recipes for Unformatt projects"

data/vendor/templates/nginx.conf.erb

@@ -4,59 +4,59 @@ upstream <%=fetch(:application)%> {
 
 <%- if fetch(:nginx_protocols,[]).map(&:to_s).include?('http') -%>
   <%- if fetch(:nginx_redirect_to_ssl, fetch(:nginx_use_ssl, false)) -%>
-  server {
-    listen         <%= fetch(:nginx_http_port, 80) %>;
-    server_name    <%=fetch(:nginx_http_server_names,fetch(:nginx_server_names))%>;
-    rewrite        ^ https://$server_name$request_uri? permanent;
-  }
+server {
+  listen         <%= fetch(:nginx_http_port, 80) %>;
+  server_name    <%=fetch(:nginx_http_server_names,fetch(:nginx_server_names))%>;
+  rewrite        ^ https://$server_name$request_uri? permanent;
+}
   <%- else -%>
-  server {
-    listen <%= fetch(:nginx_http_port, 80) %>;
-    server_name <%=fetch(:nginx_http_server_names,fetch(:nginx_server_names))%>;
-    root <%=current_path%>/public;
-    access_log <%=fetch(:nginx_access_log, "#{shared_path}/log/nginx-access.log") %>;
-    error_log <%=fetch(:nginx_error_log, "#{shared_path}/log/nginx-error.log")%>;
-    rewrite_log on;
+server {
+  listen <%= fetch(:nginx_http_port, 80) %>;
+  server_name <%=fetch(:nginx_http_server_names,fetch(:nginx_server_names))%>;
+  root <%=current_path%>/public;
+  access_log <%=fetch(:nginx_access_log, "#{shared_path}/log/nginx-access.log") %>;
+  error_log <%=fetch(:nginx_error_log, "#{shared_path}/log/nginx-error.log")%>;
+  rewrite_log on;
 
-    client_max_body_size <%=fetch(:nginx_max_body_size, '4G')%>;
-    keepalive_timeout <%=fetch(:nginx_keepalive_timeout, '5')%>;
+  client_max_body_size <%=fetch(:nginx_max_body_size, '4G')%>;
+  keepalive_timeout <%=fetch(:nginx_keepalive_timeout, '5')%>;
 
-    if (-f $document_root/public/maintenance.html) {
-      rewrite ^(.*)$ /public/maintenance.html;
-      break;
-    }
+  if (-f $document_root/public/maintenance.html) {
+    rewrite ^(.*)$ /public/maintenance.html;
+    break;
+  }
 
-    location ~ ^/(assets)/ {
-      root <%=current_path%>/public;
-      gzip_static on;
-      expires max;
-      add_header Cache-Control public;
-      break;
-    }
+  location ~ ^/(assets)/ {
+    root <%=current_path%>/public;
+    gzip_static on;
+    expires max;
+    add_header Cache-Control public;
+    break;
+  }
 
-    location / {
-      try_files $uri/index.html $uri.html $uri @<%=fetch(:application)%>;
+  location / {
+    try_files $uri/index.html $uri.html $uri @<%=fetch(:application)%>;
 
-      error_page 404              /404.html;
-      error_page 422              /422.html;
-      error_page 500 502 503 504  /500.html;
-      error_page 403              /403.html;
-      break;
-    }
+    error_page 404              /404.html;
+    error_page 422              /422.html;
+    error_page 500 502 503 504  /500.html;
+    error_page 403              /403.html;
+    break;
+  }
 
-    location @<%=fetch(:application)%> {
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header Host            $http_host;
-      proxy_headers_hash_bucket_size   <%=fetch(:nginx_hash_bucket_size, 1024)%>;
-      proxy_headers_hash_max_size      <%=fetch(:nginx_hash_max_size, 512)%>;
-      proxy_read_timeout               <%=fetch(:nginx_read_timeout, 60)%>;
-      proxy_send_timeout               <%=fetch(:nginx_send_timeout, 60)%>;
-      proxy_redirect                   off;
-      proxy_pass                       http://<%=fetch(:application)%>;
-      include                          proxy_params;
-      break;
-    }
+  location @<%=fetch(:application)%> {
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host            $http_host;
+    proxy_headers_hash_bucket_size   <%=fetch(:nginx_hash_bucket_size, 1024)%>;
+    proxy_headers_hash_max_size      <%=fetch(:nginx_hash_max_size, 512)%>;
+    proxy_read_timeout               <%=fetch(:nginx_read_timeout, 60)%>;
+    proxy_send_timeout               <%=fetch(:nginx_send_timeout, 60)%>;
+    proxy_redirect                   off;
+    proxy_pass                       http://<%=fetch(:application)%>;
+    include                          proxy_params;
+    break;
   }
+}
   <%- end -%>
 <%- end -%>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unformatt
 version: !ruby/object:Gem::Version
-  version: '1.12'
+  version: '1.13'
 platform: ruby
 authors:
 - unformatt