entrance-agent 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 034670028c5ffe7ad93f6b461d311e7e274be90e
-  data.tar.gz: 101e71764d9aedc96e243d6dd32fbe5c75d552f7
+  metadata.gz: 8aadaf5853f9c7a1e0831d9341a85d0cd47dab99
+  data.tar.gz: 18b3350bd99045d365a5a62b43033ac690d4b584
 SHA512:
-  metadata.gz: 65bc755ac61898aca62779cd349f2c4ada100b768596bc7579109eb382d3aa7ec11ecb6767e945c4a24d709569a8cc0e6fb9730ada3717ee32f7382d82cb41f2
-  data.tar.gz: 6007f3d88a74e7db6c55c770655926f37cd1d6b3d11d373012f5194116eed2a1e2a993a7a33cafcef3635f28e9a5fa654e2b28b5df6fcd50de10dadb681f1a9e
+  metadata.gz: eb203045cbc6c0adbcf16609c2577d414401e28e59c0512b2a171e0d128a198af99289cbb557903f2ac4d9d348e2f2f3a3dd2721789eaa8cf764435dc60b2d58
+  data.tar.gz: 326fb0cd21522f65a3d16077365f3362fb4ef9ede4cee87e1d625f9f6a3a97a6dbebdce80274a6919fb2c21bbb52c4f32d0823d1144a66c0100c7d2d23f75ba2

data/lib/entrance/agent/config.rb

@@ -23,13 +23,17 @@ module Entrance
         params[:doorkeepr_server]   ||= "http://localhost:3000"
         params[:doorkeepr_customer] ||= ENV["USER"]
         params[:doorkeepr_service]  ||= "rails"
+        params[:doorkeepr_url]      ||= "/doorkeepr"
         params[:workdir]            ||= Pathname.new("/tmp")
         params[:id_file]            ||= params[:workdir].join("entrance.id").to_s
         params[:entrance]             = nil
         params[:id]                   = nil
-        params[:customer]           ||= "steigr"
-        params[:http_port]            = 80
-        params[:https_port]           = 443
+        params[:customer]           ||= ENV["CUSTOMER"] || "global"
+        params[:stats_user]         ||= "haproxy"
+        params[:stats_pass]         ||= "secret"
+        params[:http_port]          ||= 80
+        params[:https_port]         ||= 443
+        params[:health_url]         ||= "/health"
         super params
       end
       def id

data/lib/entrance/agent/doorkeepr.rb

@@ -14,7 +14,7 @@ module Entrance
         @application = "doorkeepr"
         @function    = Config.current.doorkeepr_service
         @mode        = "http"
-        @uri         = "/doorkeepr"
+        @uri         = Config.current.doorkeepr_url
         Boutons.add config
       end
     end

data/lib/entrance/agent/entrance.rb

@@ -62,7 +62,7 @@ module Entrance
         @extra_sections
       end
       def stats_section
-        @stats_section ||= Synapse::Easy::Section::Stats.new(username: :foo, password: :bar,show_node: true)
+        @stats_section ||= Synapse::Easy::Section::Stats.new(username: Config.current.stats_user, password: Config.current.stats_pass,show_node: true)
       end
       def service_ids
         @service_ids || []

data/lib/entrance/agent/globalizer.rb

@@ -1,8 +1,5 @@
 module Entrance
   module Globalizer
     attr_accessor :current
-    # def current
-    #   @current ||= self.new
-    # end
   end
 end

data/lib/entrance/agent/service.rb

@@ -16,7 +16,7 @@ module Entrance
           port: 0,
           path: zk_path,
           application: name,
-          uri: "/health"
+          uri: Config.current.health_url
         }
         @backend  = Synapse::Easy::Service.new backend_params
         acl_params = {

data/lib/entrance/agent/version.rb

@@ -1,5 +1,5 @@
 module Entrance
   module Agent
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entrance-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mathias Kaufmann