haproxy-tools 0.3.0 → 0.3.1

data/lib/haproxy/treetop/config.treetop

@@ -116,7 +116,7 @@ module HAProxy::Treetop
     end
 
     rule dns_host
-      [a-zA-Z\-\.] 4..255 <Host>
+      [a-zA-Z\-\.\d] 4..255 <Host>
     end
 
     rule proxy_name

data/lib/haproxy/version.rb

@@ -1,3 +1,3 @@
 module HAProxy
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/fixtures/multi-pool.haproxy.cfg

@@ -52,3 +52,4 @@ backend logs
 	server fake_logger 127.0.0.1:9999 backup
 	server prd_log_1 10.245.174.75:8000 cookie i-prd_log_1 check inter 3000 rise 2 fall 3 maxconn 1000
 	server prd_log_2 10.215.157.10:8000 cookie i-prd_log_2 check inter 3000 rise 2 fall 3 maxconn 1000
+	server prd_log_3 cloudloghost1:8000 cookie i-prd_log_2 check inter 3000 rise 2 fall 3 maxconn 1000

data/spec/fixtures/simple.haproxy.cfg

@@ -18,6 +18,6 @@ listen http_proxy 55.55.55.55:80
 	option forwardfor # This sets X-Forwarded-For
 
 	## Define your servers to balance
-	server web1 66.66.66.66:80 weight 1 maxconn 512 check
+	server web1 dnshost66:80 weight 1 maxconn 512 check
 	server web2 77.77.77.77:80 weight 1 maxconn 512 check
 	server web3 88.88.88.88:80

data/spec/haproxy/parser_spec.rb

@@ -12,7 +12,7 @@ describe "HAProxy::Parser" do
       @config.backends.size.should == 2
       logs_backend = @config.backend('logs')
 
-      logs_backend.servers.size.should == 3
+      logs_backend.servers.size.should == 4
 
       server1 = logs_backend.servers['prd_log_1']
       server1.name.should == 'prd_log_1'
@@ -28,6 +28,11 @@ describe "HAProxy::Parser" do
       server3.name.should == 'prd_log_2'
       server3.host.should   == '10.215.157.10'
       server3.port.should == '8000'
+
+      server3 = logs_backend.servers['prd_log_3']
+      server3.name.should == 'prd_log_3'
+      server3.host.should   == 'cloudloghost1'
+      server3.port.should == '8000'
     end
   end
 
@@ -74,7 +79,7 @@ describe "HAProxy::Parser" do
 
       server1 = listener.servers['web1']
       server1.name.should == 'web1'
-      server1.host.should   == '66.66.66.66'
+      server1.host.should   == 'dnshost66'
       server1.port.should == '80'
       server1.attributes['weight'].should == '1'
       server1.attributes['maxconn'].should == '512'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haproxy-tools
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jason Wadsworth
@@ -141,6 +141,7 @@ files:
 - TODO
 - docs/haproxy-1.3-configuration.txt
 - docs/haproxy-1.4-configuration.txt
+- docs/haproxy-1.5-configuration.txt
 - haproxy-tools.gemspec
 - lib/haproxy-tools.rb
 - lib/haproxy/config.rb