luban-nginx 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16675ea7d9862ccc2cb4662bc0b64e805c51a13a
-  data.tar.gz: efb9384f2987130ff5dcb9f3f564d682f0c7e85e
+  metadata.gz: 1e3943af49cf3e11c87fee0fb62dc843eec8f966
+  data.tar.gz: 1cd30b085fbfe7cd099486a7628f2c46443a8fa3
 SHA512:
-  metadata.gz: 59376076da322a1e33e068d2595c8db905bd3eb9ea2ce8e83c6195571910d26f824c9f0b7bf2d28fc585db30a97d9a1ce3234286914ddcd899a0c267494d3bcf
-  data.tar.gz: a3b9c7057a18a5868a3c6fabbdc4a8599721fe8290b4b669fcafc2ed79092ed7a84db9e64cbe28a1afdd039aa03b9c60b97854632214fd3bc6e9652fdfc7fd74
+  metadata.gz: b9e0ac59ac1d298877be74e1408610859f587e493a9778524d5ed42e1f64a1f6094463036b1146238cc600da7cf03a852169b83c7ad6e7a63e270d4c90a4470d
+  data.tar.gz: ab8d1b52b7e6a683f92fe2db9e7938a0ac6ce4687cad8fe8bf4a29df88ff30ffbe06252135ac0f7f07a5298e74ee3e21e049e905e206545e206fffdc2cd62856

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## Version 0.1.6 (Jul 14, 2016)
+
+New features:
+  * Supported proxy configuration to Rack-based application
+
 ## Version 0.1.5 (Jul 11, 2016)
 
 Minor enhancements:

data/lib/luban/deployment/packages/nginx/base.rb

@@ -19,6 +19,12 @@ module Luban
 
         protected
 
+        def compose_task_options(opts)
+          super.tap do |opts|
+            opts.merge!(proxy_app: find_application(opts[:proxy_to])) if opts[:proxy_to]
+          end
+        end
+
         def setup_install_tasks
           super
           commands[:install].option :pcre, "PCRE version"

data/lib/luban/deployment/packages/nginx/configurator.rb

@@ -32,6 +32,20 @@ module Luban
           def mime_types_file_name
             @mime_types_file_name ||= 'mime.types'
           end
+
+          def proxy_app; task.opts.proxy_app; end
+          def proxy_to; task.opts.proxy_to end
+          def proxy?; !!proxy_to; end
+
+          def proxy_control_file_path
+            @proxy_control_file_path ||= 
+              project_path.join(proxy_to.to_s, 'shared', 'profile', proxy_to.to_s).
+                           join(proxy_control_file_name)
+          end
+
+          def proxy_control_file_name
+            @proxy_control_file_name ||= "nginx.http.proxy.conf"
+          end
         end
       end
     end

data/lib/luban/deployment/packages/nginx/templates/nginx.conf.erb

@@ -9,8 +9,9 @@ http {
   include <%= mime_types_file_path %>;
   include <%= profile_path.join('nginx.http.conf') %>;
   include <%= profile_path.join('nginx.http.*.conf') %>;
+  <%- if proxy? -%>
+  include <%= proxy_control_file_path %>;
+  <%- end -%>
 
   access_log <%= access_log_file_path %> main;
 }
-
-

data/lib/luban/deployment/packages/nginx/templates/nginx.monitrc.erb

@@ -6,6 +6,10 @@ check process <%= service_entry %>
   start program = "/bin/bash -c 'sleep 1; <%= start_command %>'"
   stop program = "/bin/bash -c '<%= stop_command %>'"
   if totalmem is greater than 10.0 MB for 40 cycles then restart
+  <%- if proxy? -%>
+  if failed port <%= proxy_app.port %> for 4 times within 8 cycles then restart
+  <%- else -%>
   if failed port 8080 for 4 times within 8 cycles then restart
+  <%- end -%>
   if cpu is greater than 80% for 20 cycles then alert
   if loadavg(5min) greater than 10 for 40 cycles then restart

data/lib/luban/deployment/packages/nginx/version.rb

@@ -2,7 +2,7 @@ module Luban
   module Deployment
     module Packages
       class Nginx
-        VERSION = '0.1.5'
+        VERSION = '0.1.6'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-nginx
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban
@@ -90,7 +90,6 @@ files:
 - lib/luban/deployment/packages/nginx/installer.rb
 - lib/luban/deployment/packages/nginx/templates/nginx.conf.erb
 - lib/luban/deployment/packages/nginx/templates/nginx.http.conf
-- lib/luban/deployment/packages/nginx/templates/nginx.http.proxy.conf
 - lib/luban/deployment/packages/nginx/templates/nginx.logrotate.erb
 - lib/luban/deployment/packages/nginx/templates/nginx.main.conf
 - lib/luban/deployment/packages/nginx/templates/nginx.monitrc.erb

data/lib/luban/deployment/packages/nginx/templates/nginx.http.proxy.conf

@@ -1,42 +0,0 @@
-# Nginx reverse proxy configuration
-
-upstream <%= serivce_entry %> {
-    # fail_timeout=0 means we always retry an upstream even if it failed
-    # to return a good HTTP response (in case the Puma master nukes a
-    # single worker for timing out).
-
-    # for UNIX domain socket setups:
-    # server unix:<%= ruby_socket_file %> fail_timeout=0;
-
-    # for TCP setups, point these to the backend servers
-    # server 192.168.0.7:<%= tcp_port %> fail_timeout=0;
-    # server 192.168.0.8:<%= tcp_port %> fail_timeout=0;
-    # server 192.168.0.9:<%= tcp_port %> fail_timeout=0;
-}
-
-server {
-    # listen <%= tcp_port %>;
-    # server_name <%= virtual_host %>;
-
-    # ~2 seconds is often enough for most cases to parse HTML/CSS and
-    # retrieve needed images/icons/frames, connections are cheap in
-    # nginx so increasing this is generally safe...
-    keepalive_timeout 5;
-
-    # path for static files
-    # root <%= current_path %>/public;
-
-    location ~ ^/assets/ {
-        gzip_static on; # to serve pre-gizpped version
-        expires 1y;
-        add_header Cache-Control public;
-        add_header ETag "";
-        break;
-    }
-
-    try_files $uri/index.html $uri.html $uri @app;
-
-    location @app {
-      proxy_pass http://<%= service_entry %>;
-    }
-}