escualo 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 432ee25813d9e628b9ee1dcd7854f6c5f4ad26fd
-  data.tar.gz: fa4492ebbe50f6e552d8b6a3750c46248da78bf0
+  metadata.gz: 5446d3c1f0bdafa1c8a866f41b52b90964a28c9f
+  data.tar.gz: fd2a635ebd0d6a171ef3573a2b4d7d42b0499bf6
 SHA512:
-  metadata.gz: 1a0a3c01d37d9eaf25cf86a3379985994e4f976cf419c8ad7152d74e40a64980e6b5415e84cdc1435e5d0ca6dd100903db162b27dcc49acfc149d9733587da83
-  data.tar.gz: 51c6aaa54956684835e5b982ce40522c2635b1b9a501a054120626882b16148ef2cfb5c0966f481285d4d48d30d822b0f7b20060f0e627698b7dec1cbba81c8e
+  metadata.gz: 801cec7433ec4dc70fe695f58ae5eb7181b7ca9ad9e9b5cf6744779577f7a3ddedf20b25cad535ae8f46652e8b3a223014e9859a3263151db7b65b7cb42ed98b
+  data.tar.gz: 184a0ce50ccbfb7ae7c2abecd4b1040ac6915ae03056d1c03a37c5e3c24f030d379be3fc42ad661c74d7a91f2f5fa0c9bc13925b2acd83ec7d8fdfcb8a5a755b

data/lib/commands/artifact.rb

@@ -53,7 +53,7 @@ command 'artifact create service' do |c|
       end
 
       step 'Configuring monit...' do
-        Escualo::Artifact.configure_monit ssh, name
+        Escualo::Artifact.configure_monit ssh, name: name, port: port
       end
 
       step 'Creating push infrastructure' do

data/lib/escualo/artifact.rb

@@ -53,9 +53,10 @@ module Escualo
       ssh.exec! "chmod +x #{hook_file}"
     end
 
-    def self.configure_monit(ssh, name)
+    def self.configure_monit(ssh, options)
+      name = options[:name]
       ssh.exec! 'mkdir -p /etc/monit/conf.d/'
-      ssh.upload_template! "/etc/monit/conf.d/escualo-#{name}", 'monit.conf', name: name
+      ssh.upload_template! "/etc/monit/conf.d/escualo-#{name}", 'monit.conf', options
       ssh.exec! 'monit reload'
     end
 

data/lib/escualo/bootstrap.rb

@@ -43,9 +43,9 @@ module Escualo
         cp monit-#{options.monit_version}/bin/monit /usr/bin/monit
         ln -s /etc/monit/monitrc /etc/monitrc
         service monit start
-        'set httpd port 2812 and' > /etc/monit/conf.d/web-server
-        '  allow 0.0.0.0/0.0.0.0' >> /etc/monit/conf.d/web-server
-        '  allow admin:#{options.monit_password}' >> /etc/monit/conf.d/web-server
+        echo 'set httpd port 2812 and' > /etc/monit/conf.d/web-server
+        echo '  allow 0.0.0.0/0.0.0.0' >> /etc/monit/conf.d/web-server
+        echo '  allow admin:#{options.monit_password}' >> /etc/monit/conf.d/web-server
         monit reload
     }, options
     end

data/lib/escualo/env.rb

@@ -26,7 +26,12 @@ module Escualo
     end
 
     def self.present?(ssh, variable)
-      ssh.exec!("cat ~/.escualo/vars/#{variable}").present?
+      value = get(ssh, variable)
+      value.present? && !value.include?('No such file or directory')
+    end
+
+    def self.get(ssh, variable)
+      ssh.exec!("cat ~/.escualo/vars/#{variable}")
     end
 
     def self.set(ssh, variables)

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
   BASE_VERSION = '3.1'
 end

data/lib/templates/monit.conf.erb

@@ -1,11 +1,10 @@
-check host escualo-<%= @name %> with address $HOST
-  start "/sbin/start <%= @name %>"
-  stop "/sbin/stop <%= @name %>"
+check host escualo-<%= name %> with address localhost
+  start "/sbin/start <%= name %>"
+  stop "/sbin/stop <%= name %>"
   if failed
-    port $PORT
+    port <%= port %>
     protocol HTTP
     request "/"
     status > 199
     with timeout 30 seconds
-  then restart
-EOF
+  then restart

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli