feature #2276 Single Executable: use new names for settings sections

The puppet-internal settings sections aren't actually exposed to the
user, but to reduce confusion I've renamed them to be consistent with
the single-executable application names.

Signed-off-by: Jesse Wolfe <jes5199@gmail.com>

9 files changed, 13 insertions, 13 deletions

diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index e8ed04079..609a4580a 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -233,7 +233,7 @@ class Puppet::Application::Agent < Puppet::Application
             Puppet::Util::Log.newdestination(logdest)
         end
 
-        Puppet.settings.use :main, :puppetd, :ssl
+        Puppet.settings.use :main, :agent, :ssl
 
         # We need to specify a ca location for all of the SSL-related i
         # indirected classes to work; in fingerprint mode we just need 
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 17ff5de53..433a4d2f2 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -146,7 +146,7 @@ class Puppet::Application::Master < Puppet::Application
             exit(Puppet.settings.print_configs ? 0 : 1)
         end
 
-        Puppet.settings.use :main, :puppetmasterd, :ssl
+        Puppet.settings.use :main, :master, :ssl
 
         # A temporary solution, to at least make the master work for now.
         Puppet::Node::Facts.terminus_class = :yaml
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index d45c4a79c..f54611773 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -70,7 +70,7 @@ class Puppet::Configurer
 
     # Just so we can specify that we are "the" instance.
     def initialize
-        Puppet.settings.use(:main, :ssl, :puppetd)
+        Puppet.settings.use(:main, :ssl, :agent)
 
         self.class.instance = self
         @running = false
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 992b218c5..9efa99cb2 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -368,7 +368,7 @@ module Puppet
         }
     )
 
-    self.setdefaults(:puppetmasterd,
+    self.setdefaults(:master,
         :user => ["puppet", "The user puppetmasterd should run as."],
         :group => ["puppet", "The group puppetmasterd should run as."],
         :manifestdir => ["$confdir/manifests",
@@ -458,7 +458,7 @@ module Puppet
             in the catalogs."]
     )
 
-    self.setdefaults(:puppetd,
+    setdefaults(:agent,
         :localconfig => { :default => "$statedir/localconfig",
             :owner => "root",
             :mode => 0660,
@@ -742,7 +742,7 @@ module Puppet
             branch under your main directory."]
     )
 
-    setdefaults(:puppetmasterd,
+    setdefaults(:master,
         :storeconfigs => {:default => false, :desc => "Whether to store each client's configuration.  This
             requires ActiveRecord from Ruby on Rails.",
             :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index c3bf383bb..c0eedfcde 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -11,7 +11,7 @@ module Puppet::Rails
         # the state dir on every test.
         return if ActiveRecord::Base.connected?
 
-        Puppet.settings.use(:main, :rails, :puppetmasterd)
+        Puppet.settings.use(:main, :rails, :master)
 
         ActiveRecord::Base.logger = Logger.new(Puppet[:railslog])
         begin
@@ -131,7 +131,7 @@ module Puppet::Rails
             raise Puppet::DevError, "No activerecord, cannot init Puppet::Rails"
         end
 
-        Puppet.settings.use(:puppetmasterd, :rails)
+        Puppet.settings.use(:master, :rails)
 
         begin
             ActiveRecord::Base.establish_connection(database_arguments())
diff --git a/spec/unit/application/agent.rb b/spec/unit/application/agent.rb
index fcf01e071..598492bc7 100755
--- a/spec/unit/application/agent.rb
+++ b/spec/unit/application/agent.rb
@@ -298,7 +298,7 @@ describe Puppet::Application::Agent do
         end
 
         it "should use :main, :puppetd, and :ssl" do
-            Puppet.settings.expects(:use).with(:main, :puppetd, :ssl)
+            Puppet.settings.expects(:use).with(:main, :agent, :ssl)
 
             @puppetd.setup
         end
diff --git a/spec/unit/application/master.rb b/spec/unit/application/master.rb
index ff0c1994c..54336c10e 100644
--- a/spec/unit/application/master.rb
+++ b/spec/unit/application/master.rb
@@ -170,8 +170,8 @@ describe Puppet::Application::Master do
             lambda { @master.setup }.should raise_error(SystemExit)
         end
 
-        it "should tell Puppet.settings to use :main,:ssl and :puppetmasterd category" do
-            Puppet.settings.expects(:use).with(:main,:puppetmasterd,:ssl)
+        it "should tell Puppet.settings to use :main,:ssl and :master category" do
+            Puppet.settings.expects(:use).with(:main,:master,:ssl)
 
             @master.setup
         end
diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb
index b16e6be4a..ecf48b6d4 100755
--- a/spec/unit/rails.rb
+++ b/spec/unit/rails.rb
@@ -17,7 +17,7 @@ describe Puppet::Rails, "when initializing any connection" do
     end
 
     it "should use settings" do
-        Puppet.settings.expects(:use).with(:main, :rails, :puppetmasterd)
+        Puppet.settings.expects(:use).with(:main, :rails, :master)
 
         Puppet::Rails.connect
     end
diff --git a/test/other/report.rb b/test/other/report.rb
index dd3689432..9e0a9bbbe 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -72,7 +72,7 @@ class TestReports < Test::Unit::TestCase
 
         # We have to reuse reporting here because of something going on in the
         # server/report.rb file
-        Puppet.settings.use(:main, :puppetmasterd)
+        Puppet.settings.use(:main, :master)
 
         3.times { |i|
             log = Puppet.warning("Report test message %s" % i)