dendrite 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5babf7a3f860ae08b38ca9eb3f8903e3e2bec02f
-  data.tar.gz: 58cee017cdabf058617b25e54eda2d4b3bacdee6
+  metadata.gz: f596c584ad8e20047d82cbcce8cdd11a3953a0ee
+  data.tar.gz: e354f2e265dc829295d77cd38bda3c998ab4a11d
 SHA512:
-  metadata.gz: 664614a8873dcdb6c2b69c4cad4f077e0a77d0c576298805a61181d19f458189dc0a5c0018bbf8504c2db76b7be7fd97d29b5362dd170479062d5545990c625c
-  data.tar.gz: d57f275874c5a4b5fdb6f95dba84008d257be268e2f79005f1f5f29911f06fd4af969a9207474cb96d236df3a66b10bec977e3a39567e8119ea8964ddf486155
+  metadata.gz: 6ae57fe86462e173bdd374c659bfe6edaf1a775124f0f9e06d56c33e8ced70e5399d139cf7ea99e3a8d2be3415c52c2800927b0eab56cebe075e7635b41b3089
+  data.tar.gz: eaa0a4b3fe3d2aab3cb84485443619953d9a14cdc471eb96394ff6cd3122c99621339a4e51dc967e13d34162a8da8454693a2541de273d7b79f86e96f33ed3ff

data/conf/config.yml

@@ -24,6 +24,9 @@ synapse:
     do_writes: true
     do_reloads: true
     do_socket: false
+    shared_frontend:
+    - "bind 127.0.0.1:8082"
+    - "bind 127.0.0.1:8089"
     global:
     - daemon
     - user haproxy

data/conf/services/service.yml

@@ -23,11 +23,16 @@ subcomponents:
     telemetry:
       health_url: /
       notification_email: foo@bar.com
+    domain_names:
+      - domain_name: foobar.com
+        environment: prd
+      - domain_name: foobar2.com
+        environment: prd
     default_servers:
       - host: 192.168.1.1
         port: 8080
         environment: stg
-      - host: 50.312.312.312
+      - host: 192.168.1.2
         port: 8080
         environment: prd
     dependencies:

data/lib/dendrite/generators/synapse.rb

@@ -42,6 +42,7 @@ module Dendrite
         def_delegator :service, :component, :component
         def_delegator :service, :organization, :organization
         def_delegator :service, :default_servers, :default_servers
+        def_delegator :service, :domain_names, :domain_names
         def_delegator :service, :metadata, :metadata
 
 
@@ -78,7 +79,7 @@ module Dendrite
         end
 
         def haproxy_config
-          {
+          data = {
             haproxy: {
               port: service.loadbalancer_port,
               bind_address: bind_address,
@@ -87,6 +88,14 @@ module Dendrite
               backend_order: metadata && metadata.sticky_session ? 'asc' : nil
             }
           }
+
+          if domain_names[environment] && domain_names[environment].length > 0
+            data[:haproxy][:shared_frontend] = [
+              "acl is_#{name} hdr_dom(host) " + domain_names[environment].collect {|dns| " -i #{dns.domain_name} "}.join ,
+              "use_backend #{name} if is_#{name}"
+            ]
+          end
+          return data
         end
 
         def mode

data/lib/dendrite/service_node.rb

@@ -65,6 +65,12 @@ module Dendrite
       validates :port, numericality: { only_integer: true }
     end
 
+    DomainName = Struct.new(:environment, :domain_name) do
+      include ActiveModel::Validations
+      validates_presence_of :environment
+      validates_presence_of :domain_name
+    end
+
     Telemetry = Struct.new(:health_url, :notification_email) do
       include ActiveModel::Validations
       validates_presence_of :health_url
@@ -113,7 +119,7 @@ module Dendrite
 
     attr_reader :organization, :component, :lead_email, :team_email,
                 :type, :deploy, :scale, :ports, :dependencies, :telemetry,
-                :default_servers, :metadata, :users
+                :default_servers, :metadata, :users, :domain_names
                 # :name is set but magically
 
     validates_presence_of :organization, :component, :lead_email, :team_email,
@@ -130,6 +136,7 @@ module Dendrite
     def initialize(**args)
       @ports = {}
       @default_servers = {}
+      @domain_names = {}
       args.each do |k,v|
         case k
         when :ports
@@ -147,6 +154,11 @@ module Dendrite
             @default_servers[node[:environment]] ||= []
             @default_servers[node[:environment]] << DefaultServer.new(node[:environment], node[:host], node[:port])
           end
+        when :domain_names
+          v.each do |dns|
+            @domain_names[dns[:environment]] ||= []
+            @domain_names[dns[:environment]] << DomainName.new(dns[:environment], dns[:domain_name])
+          end
         when :metadata
           @metadata = Metadata.new(v)
         when :users

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Yagnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler