Skip to content

Commit

Permalink
move Configuration to Katello namespace
Browse files Browse the repository at this point in the history
split configuration to files by class
move logging to katello dir
  • Loading branch information
Petr Chalupa committed Mar 6, 2013
1 parent ba55436 commit b141a1b
Show file tree
Hide file tree
Showing 14 changed files with 436 additions and 378 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# load Katello configuration
path = File.expand_path('../lib', __FILE__)
$LOAD_PATH << path unless $LOAD_PATH.include? path
require 'katello_config'
require 'katello/load_configuration'

# When adding new version requirement check out EPEL6 repository first
# and use this version if possible. Also check Fedora version (usually higher).
Expand Down
2 changes: 1 addition & 1 deletion Gemfile32
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ end
# load Katello configuration
path = File.expand_path('../lib', __FILE__)
$LOAD_PATH << path unless $LOAD_PATH.include? path
require 'katello_config'
require 'katello/load_configuration'

# When adding new version requirement check out EPEL6 repository first
# and use this version if possible. Also check Fedora version (usually higher).
Expand Down
4 changes: 2 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

path = File.expand_path("../lib", File.dirname(__FILE__))
$LOAD_PATH << path unless $LOAD_PATH.include? path
require 'katello_config'
require 'katello_logging'
require 'katello/load_configuration'
require 'katello/logging'


# If you have a Gemfile, require the gems listed there, including any gems
Expand Down
2 changes: 1 addition & 1 deletion config/compass.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
path = File.expand_path('../lib', File.dirname(__FILE__))
$LOAD_PATH << path unless $LOAD_PATH.include? path

require 'katello_config'
require 'katello/load_configuration'
require 'ninesixty'

# Set this to the root of your project when deployed:
Expand Down
1 change: 1 addition & 0 deletions katello.spec
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,7 @@ usermod -a -G katello-shared tomcat
%{homedir}/db/seeds.rb
%{homedir}/integration_spec
%{homedir}/lib/*.rb
%{homedir}/lib/katello/
%exclude %{homedir}/lib/README
%exclude %{homedir}/app/lib/README
%{homedir}/app/lib/*.rb
Expand Down
Loading

0 comments on commit b141a1b

Please sign in to comment.