diff options
| -rw-r--r-- | lib/puppet/configuration.rb | 2 | ||||
| -rwxr-xr-x | test/puppet/conffiles.rb | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb index 5764a2139..e4e1a6ec6 100644 --- a/lib/puppet/configuration.rb +++ b/lib/puppet/configuration.rb @@ -206,7 +206,7 @@ module Puppet :ca_server => ["$server", "The server to use for certificate authority requests. It's a separate server because it cannot and does not need to horizontally scale."], - :ca_port => ["$master_port", "The port to use for the certificate authority."] + :ca_port => ["$masterport", "The port to use for the certificate authority."] ) self.setdefaults("filebucket", diff --git a/test/puppet/conffiles.rb b/test/puppet/conffiles.rb index 6336968aa..3dfa53a13 100755 --- a/test/puppet/conffiles.rb +++ b/test/puppet/conffiles.rb @@ -95,6 +95,15 @@ class TestConfFiles < Test::Unit::TestCase } } end + + # Make sure that basic config generation works; this also ensures + # that the default config is free of simple typos etc. + def test_genconfig + assert_nothing_raised { + Puppet::config::to_config + } + end + end # $Id$ |