diff options
| -rw-r--r-- | lib/puppet/provider/package/appdmg.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/rails.rb | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/lib/puppet/provider/package/appdmg.rb b/lib/puppet/provider/package/appdmg.rb index 5729a46f1..c63c26a1f 100644 --- a/lib/puppet/provider/package/appdmg.rb +++ b/lib/puppet/provider/package/appdmg.rb @@ -15,6 +15,7 @@ # require 'ruby-debug' # Debugger.start +require 'puppet/provider/package' Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Package) do desc "Package management which copies application bundles to a target." diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index 6664d8bac..b68e7d352 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -9,7 +9,7 @@ module Puppet::Rails # This global init does not work for testing, because we remove # the state dir on every test. unless ActiveRecord::Base.connected? - Puppet.config.use(:main) + Puppet.config.use(:main, :rails, :puppetmasterd) ActiveRecord::Base.logger = Logger.new(Puppet[:railslog]) ActiveRecord::Base.allow_concurrency = true @@ -61,13 +61,6 @@ module Puppet::Rails if Puppet[:dbmigrate] migrate() end - - # For now, we have to use :puppet, too, since non-puppetmasterd processes - # (including testing) put the logdir in :puppet, not in :puppetmasterd. - Puppet.config.use(:rails, :main, :puppetmasterd) - - # This has to come after we create the logdir with the :use above. - ActiveRecord::Base.logger = Logger.new(Puppet[:railslog]) end # Migrate to the latest db schema. |