canzea 0.1.40 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b159fea66d70a890582c30699c629c3f39d1a7da
-  data.tar.gz: 5f4c09773e77e2404958cad2882118a6fe637e37
+  metadata.gz: 1038b6a7395c045a997412801729f93000e4a8dd
+  data.tar.gz: 33d5a1b94baa890d4e9282ae7ae1c7f00bf30772
 SHA512:
-  metadata.gz: 5d5377987328771014950546eaae8bd93856133b5b4b3571014ced10d938a1ec1097f8d5ab8bf36cad1c389e8b349f14eaa9e1e4b3e462e520644853a805e82d
-  data.tar.gz: 9a27423fdb1017e836b1b02ca1958ee13c97c4f3502d96cadb9cd336a4af0232c788cb01c7a9a536fcb0477d90bf5c2770ec513d2b63e14dc854a80dc0663141
+  metadata.gz: eb78d932f08445bcfb5dee485b7f43b47b08a79adad0d346a549f9d9722453703ea5b0ca57e5f7a225a5ebc13449040f34a96f6e3daf6281f6a7ebd39879d37b
+  data.tar.gz: 7d7142b7077522cb53034b5d0309e7b699b5f9f5fb1518b2ab84c1e01dbe63e72b356b4b29ddbf46ba94c8ce80568747938d579a94ec7768637a5ccbf7d8c8d8

data/lib/canzea/config.rb

@@ -11,6 +11,7 @@ module Canzea
               :git_repo => "/opt/cloud-profile",
               :logging_root => Dir.home,
               :pwd => Dir.pwd,
+              :consul_tls => false,
               :consul_tls_ca_file => "/etc/consul.d/ssl/ca.cert",
               :consul_tls_cert_file => "/etc/consul.d/ssl/consul.cert",
               :consul_tls_key_file => "/etc/consul.d/ssl/consul.key",

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.40"
+  VERSION = "0.1.41"
 end

data/lib/prepare-environment.rb

@@ -41,18 +41,21 @@ class PrepareEnvironment
 
           puts "-- Looking up...#{svc['name']}"
 
-          pemCert = File.read(Canzea::config[:consul_tls_cert_file])
-          pemKey = File.read(Canzea::config[:consul_tls_key_file])
-
           uri = URI.parse(ENV["CONSUL_URL"] + '/v1/catalog/service/' + svc['name'])
           http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = true
-          http.ca_file = Canzea::config[:consul_tls_ca_file]
-          http.cert = OpenSSL::X509::Certificate.new(pemCert)
-          http.key = OpenSSL::PKey::RSA.new(pemKey)
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          # http.set_debug_output($stdout)
-          http.ssl_version = :SSLv23
+
+          if (Canzea::config[:consul_tls])
+              pemCert = File.read(Canzea::config[:consul_tls_cert_file])
+              pemKey = File.read(Canzea::config[:consul_tls_key_file])
+
+              http.use_ssl = true
+              http.ca_file = Canzea::config[:consul_tls_ca_file]
+              http.cert = OpenSSL::X509::Certificate.new(pemCert)
+              http.key = OpenSSL::PKey::RSA.new(pemKey)
+              http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+              # http.set_debug_output($stdout)
+              http.ssl_version = :SSLv23
+          end
           request = Net::HTTP::Get.new(uri.request_uri)
           resp = http.request(request)
 
@@ -89,18 +92,23 @@ class PrepareEnvironment
 
           puts "-- Looking up secret...#{svc['name']}"
 
-          pemCert = File.read(Canzea::config[:vault_tls_cert_file])
-          pemKey = File.read(Canzea::config[:vault_tls_key_file])
-
           uri = URI.parse(ENV["VAULT_URL"] + '/v1/secret/' + svc['name'])
           http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = true
-          http.ca_file = Canzea::config[:consul_tls_ca_file]
-          http.cert = OpenSSL::X509::Certificate.new(pemCert)
-          http.key = OpenSSL::PKey::RSA.new(pemKey)
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          # http.set_debug_output($stdout)
-          http.ssl_version = :SSLv23
+
+          if (Canzea::config[:consul_tls])
+
+              pemCert = File.read(Canzea::config[:vault_tls_cert_file])
+              pemKey = File.read(Canzea::config[:vault_tls_key_file])
+
+              http.use_ssl = true
+              http.ca_file = Canzea::config[:consul_tls_ca_file]
+              http.cert = OpenSSL::X509::Certificate.new(pemCert)
+              http.key = OpenSSL::PKey::RSA.new(pemKey)
+              http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+              # http.set_debug_output($stdout)
+              http.ssl_version = :SSLv23
+          end
+
           request = Net::HTTP::Get.new(uri.request_uri)
 
           request['X-Vault-Token'] = ENV["VAULT_TOKEN"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.41
 platform: ruby
 authors:
 - Canzea Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler