vps 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 591e2f6174b369e271f23bc60b9d9492045259f3
-  data.tar.gz: 5b325e542fbacd8a0cf33df939c58db68c17995b
+  metadata.gz: 19a1e8448e7c6d7549da881d3c4410dffd9eee99
+  data.tar.gz: 8ed547a6a851bfc83a7be9df20d8781d8bf39d6b
 SHA512:
-  metadata.gz: 07edf2782cd06c64ad79478dfc51c168552822530083f3170dd702fc46aec3f61600390abb8846cfe1ce7de021f48e5f27a39f1530cfd2cca75ef859c42ce67e
-  data.tar.gz: 7b59c311ae6fda27227c2128c4dbf26338b6a2e8f4740e49b05cb321b24eb28f2d78d45eaf53e58c28b8d3360abeaf02a5d3cfc2c64572af81ed8bb3cd136f0d
+  metadata.gz: 589a2204c45d5eb76a578258d6ac56b053f7efd99fec980ed81b8b9f58e2d86d25918ddd0eff90cb91be63ba1d5f0bae4b26e9bedb7636d264a1e6c377693391
+  data.tar.gz: 477b312e229c9cef09c4f75a9e7e8f0aff05be8d9882940b9c03721049563addc569ace2c57739cb73c4a32390c8fdd78f8743af161037183be871745652d791

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## VPS CHANGELOG
 
+### Version 0.2.0 (December 31, 2019)
+
+* Provide ability to add both custom HTTP and HTTPS Nginx configs
+
 ### Version 0.1.2 (September 29, 2019)
 
 * Run postload tasks at the end of deployment

data/lib/vps/cli/upstream.rb

@@ -10,7 +10,10 @@ module VPS
 
         unless config[:upstreams].any?{|upstream| upstream[:name] == name}
           spec = derive_upstream(path)
-          spec[:nginx] ||= nil
+          spec[:nginx] ||= {
+            :http => nil,
+            :https => nil
+          }
           config[:upstreams].push(spec.merge({
             :name => name || File.basename(path),
             :path => path,

data/lib/vps/version.rb

@@ -1,7 +1,7 @@
 module VPS
   MAJOR = 0
-  MINOR = 1
-  TINY  = 2
+  MINOR = 2
+  TINY  = 0
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/templates/docker/data/nginx/app.conf.erb

@@ -18,6 +18,10 @@ server {
   server_name <%= domains %>;
   server_tokens off;
 
+  <%- end %>
+  <%- if nginx[:http] %>
+<%= nginx[:http].gsub("PROXY_PASS", proxy_pass).indent(2) %>
+
   <%- end %>
   <%- if https %>
   location /.well-known/acme-challenge/ {
@@ -47,8 +51,8 @@ server {
   try_files $uri @app;
 
   <%- end %>
-  <%- if nginx[:config] %>
-<%= nginx[:config].gsub("PROXY_PASS", proxy_pass).indent(2) %>
+  <%- if nginx[:https] %>
+<%= nginx[:https].gsub("PROXY_PASS", proxy_pass).indent(2) %>
 
   <%- end %>
   location <%= nginx[:try_files] ? "@app" : "/" %> {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vps
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-29 00:00:00.000000000 Z
+date: 2019-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor