Permalink
Browse files

Making Berskfile.conf.rb optional

  • Loading branch information...
1 parent 9dc858f commit 5cb4039ac8ab5425c9cbd411a64a6b68a51643cd @temujin9 temujin9 committed Nov 14, 2012
Showing with 3 additions and 2 deletions.
  1. +3 −2 Berksfile
  2. 0 config/{Berksfile.conf.rb → Berksfile.conf.rb.example}
View
@@ -1,5 +1,6 @@
-require './config/Berksfile.conf'
-require './config/Berksfile.inc'
+CONF = File.join(File.dirname(__FILE__), 'config/Berksfile.conf.rb')
+require CONF if File.exists? CONF
+require File.join(File.dirname(__FILE__), 'config/Berksfile.inc.rb')
opscode_cookbook 'ant'
opscode_cookbook 'apache2'
File renamed without changes.

0 comments on commit 5cb4039

Please sign in to comment.