From 1a2e1bcdd31e00a925e1e55693e9dbe241289950 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Sat, 2 May 2009 20:05:19 +0200 Subject: Fixing #2195 - the Server class handles bindaddress The Server class has all of the logic now, instead of doing weird things in the defaults. Signed-off-by: Luke Kanies --- spec/integration/defaults.rb | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'spec/integration') diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb index 003712aab..2d51a3cbc 100755 --- a/spec/integration/defaults.rb +++ b/spec/integration/defaults.rb @@ -49,24 +49,8 @@ describe "Puppet defaults" do Puppet.settings.element(:rundir).group.should be_nil end - it "should default to 0.0.0.0 for its bind address and 'webrick' for its server type" do - Puppet.settings[:servertype] = "webrick" - Puppet.settings[:bindaddress].should == "0.0.0.0" - end - - it "should default to 0.0.0.0 for its bind address if the server is webrick" do - Puppet.settings[:servertype] = "webrick" - Puppet.settings[:bindaddress].should == "0.0.0.0" - end - - it "should default to 127.0.0.1 for its bind address if the server is mongrel" do - Puppet.settings[:servertype] = "mongrel" - Puppet.settings[:bindaddress].should == "127.0.0.1" - end - - it "should allow specification of a different bind address" do - Puppet.settings[:bindaddress] = "192.168.0.1" - Puppet.settings[:bindaddress].should == "192.168.0.1" + it "should use a bind address of ''" do + Puppet.settings[:bindaddress].should == "" end [:factdest, :pluginpath].each do |setting| -- cgit