pvcglue 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c56db4a7378a7ddeea2201b0e45a8fb78708ffd2
-  data.tar.gz: 8eedb984f35fc085d352045a327d6c92cae3677e
+  metadata.gz: 2890cccd0710566ea507d1c23da0a7a68f8b7bfe
+  data.tar.gz: 1fb1590b756c1cc4a1269c281e0d2ffacd4ad5d6
 SHA512:
-  metadata.gz: 6433deb598cb1bc3a6136168c0a5b32a3232dd48f0f55d0a6d4b645b78b9b69452cf270f736c6b3652ab9343893ac39a18ef5f0bd284c2d9488bb2097198fc4f
-  data.tar.gz: 1c161a335f0feac6d06f72ed018a397b8ab09d7f761a00dc94131c66182004aa5e3aad4fe0d9a69bdc019792b819fdded0add7f667ba9b7b99acba56af759b25
+  metadata.gz: 7158f52deb021af5493fd7955565b825cbb5c1c15912f0c6c34868cea6e9ca58def75b6f1423c0d58ad5643abdf2602f52ecf7f613783a59d64be6373614d8e5
+  data.tar.gz: c2dbc3ff023af3947de40504564a628da2d97b21232bf59937d8946cf261911eafceb92c91231746621dbda2e9f5fa534229611ea69d4c5edb02c92b1344308e

data/lib/pvcglue/cloud.rb

@@ -240,6 +240,22 @@ module Pvcglue
       data[app_name][:repo_url]
     end
 
+    def dos_conn_limit_per_ip
+      data[app_name][:dos_conn_limit_per_ip] || stage[:dos_conn_limit_per_ip] || "10"
+    end
+
+    def dos_rate
+      data[app_name][:dos_rate] || stage[:dos_rate] || "1"
+    end
+
+    def dos_burst
+      data[app_name][:dos_burst] || stage[:dos_burst] || "30"
+    end
+
+    def additional_linked_dirs
+      data[app_name][:additional_linked_dirs] || stage[:additional_linked_dirs] || ""
+    end
+
     def client_header_timeout
       data[app_name][:client_header_timeout] || stage[:client_header_timeout] || "60s"
     end

data/lib/pvcglue/templates/denial_of_service.erb

@@ -1,3 +1,3 @@
 
-  limit_conn conn_limit_per_ip 10;
-  limit_req zone=req_limit_per_ip burst=30 nodelay;
+  limit_conn conn_limit_per_ip <%= Pvcglue.cloud.dos_conn_limit_per_ip %>;
+  limit_req zone=req_limit_per_ip burst=<%= Pvcglue.cloud.dos_burst %> nodelay;

data/lib/pvcglue/templates/deploy.rb.erb

@@ -5,7 +5,7 @@ set :repo_url, '<%= Pvcglue.cloud.repo_url %>'
 
 set :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }
 
-set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets}
+set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets <%= Pvcglue.cloud.additional_linked_dirs %>}
 
 set :bundle_flags, '--deployment' # Remove the `--quiet` flag
 

data/lib/pvcglue/templates/lb.nginx.conf.erb

@@ -88,7 +88,7 @@ http {
 
   # DoS prevention
   limit_conn_zone $binary_remote_addr zone=conn_limit_per_ip:10m;
-  limit_req_zone $binary_remote_addr zone=req_limit_per_ip:10m rate=1r/s;
+  limit_req_zone $binary_remote_addr zone=req_limit_per_ip:10m rate=<%= Pvcglue.cloud.dos_rate %>r/s;
 
 	include /etc/nginx/conf.d/*.conf;
 	include /etc/nginx/sites-enabled/*;

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.28"
+  VERSION = "0.1.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
 platform: ruby
 authors:
 - Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler