vps 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 495b59ec7e4efd137d87d03d2d5592512849879f
-  data.tar.gz: d9bf0c254e4e532e051a892096ba8cbdfbedda3b
+  metadata.gz: 0715c15db0c61c43f427cde770c38cde3f65e677
+  data.tar.gz: 62fbbc6d56af47c025031dd5125ab7a4072d546d
 SHA512:
-  metadata.gz: bbc9e798ff049bcef6ca15750ca26a9fb6d015706068628118381d2a8702f1a041f7a6d55d0d2145a1e8de52c640e19f8d48e9eaf522a62d8714e22a518e1ad7
-  data.tar.gz: b52f3f9474ef1cc806bcf2fd14be10951641347a439016be2386e5d39c2c18c4575feabea7f4f4ab2042c87cebcf894a77f716daece7ed25fa77093d4edf46d5
+  metadata.gz: 0850d9d9a5888d1162e7cb491906f0afea445f82535a68ae03014b6304cb594c7c81f765f14325bf0b1d295a1a88a7e07ac009859f6d5c0ba727d3fee34988a8
+  data.tar.gz: 7c6dfffa4ce37dc82012bf13865cc03f9feb6367c1565305f5a7461f88fe73d951fccd502fbfc6544df7505f50fb1de15feabdef5ec29bffd682cfc0a768f1be

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## VPS CHANGELOG
 
+### Version 0.2.3 (January 2, 2020)
+
+* Support upstreams without domains
+
 ### Version 0.2.2 (January 2, 2020)
 
 * Automatically add container names for upstreams and services

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/vps/cli/playbook/state.rb

@@ -57,7 +57,7 @@ module VPS
             (hash || {}).fetch(key)
           end.tap do |value|
             if to_domain && value
-              if (domain = value[:domains].first)
+              if (domain = (value[:domains] || ["-"]).first)
                 return domain.gsub(/https?:\/\//, "")
               end
             end

data/lib/vps/version.rb

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

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

@@ -3,7 +3,7 @@
 upstream <%= upstream[:name] %> {
   server <%= upstream[:name] %>:<%= upstream[:port] %>;
 }
-<%- upstream[:domains].partition{|domain| domain.include?("http://")}.reject(&:empty?).each do |domains| %>
+<%- (upstream[:domains] || []).partition{|domain| domain.include?("http://")}.reject(&:empty?).each do |domains| %>
 <%-
   https = domains.first.include?("https://")
   domains = domains.collect{|domain| domain.gsub(/https?:\/\//, "")}.join(" ")

data/templates/docker/upstream/init-letsencrypt.sh.erb

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-<%- if (domains = upstream[:domains].collect{|domain| domain.dup.gsub!("https://", "")}.compact).any? %>
+<%- if (domains = (upstream[:domains] || []).collect{|domain| domain.dup.gsub!("https://", "")}.compact).any? %>
 domains=(<%= domains.join(" ") %>)
 email="<%= upstream[:email] || "noreply@#{domains.first}" %>" # Adding a valid address is strongly recommended
 data_path="./data/certbot"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vps
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Paul Engel