summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/server.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/network/server.rb')
-rw-r--r--lib/puppet/network/server.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb
index 941cb9df1..0541c1c3b 100644
--- a/lib/puppet/network/server.rb
+++ b/lib/puppet/network/server.rb
@@ -1,9 +1,13 @@
class Puppet::Network::Server
- attr_reader :server_type, :http_server_class, :protocols
+ attr_reader :server_type, :http_server_class, :protocols, :address, :port
def initialize(args = {})
@server_type = Puppet[:servertype] or raise "No servertype configuration found." # e.g., WEBrick, Mongrel, etc.
@http_server_class = http_server_class_by_type(@server_type)
+ @address = args[:address] || Puppet[:bindaddress] ||
+ raise(ArgumentError, "Must specify :address or configure Puppet :bindaddress.")
+ @port = args[:port] || Puppet[:masterport] ||
+ raise(ArgumentError, "Must specify :port or configure Puppet :masterport")
@protocols = []
@listening = false
@routes = {}