Permalink
Browse files

Move config/environment -> environment, to match fezzik's default con…

…figuration
  • Loading branch information...
1 parent b95d007 commit d1085e312cb588f48c957d9305abab50224ed9d0 @philc philc committed Apr 17, 2012
View
@@ -54,7 +54,7 @@ You can view the Resque dashboard and inspect failed Resque jobs by navigating t
## <a name="section_3"></a>3 Viewing Repositories
-Once Barkeep is set up for development, look in `config/environment.rb`. By default, Barkeep will look in
+Once Barkeep is set up for development, look in `environment.rb`. By default, Barkeep will look in
`~/barkeep_repos/`, though you can change the `REPOS_ROOT` variable to adjust it.
Create the directory and use normal `git clone` to add repositories. Now Barkeep can see them!
@@ -153,7 +153,7 @@ If everything's working, you should be able to check Barkeep at
## <a name="section_6"></a>6 Setting up email
Set the email address and password of the Gmail account you want to use with Barkeep in
-`config/environment.rb`.
+`environment.rb`.
Note that emails for new commits are sent from user**+commits**@example.com and comments are sent from
user**+comments**@example.com. By default, Gmail won't allow your account to send from these addresses
View
@@ -15,7 +15,7 @@
require "openid/store/filesystem"
require "openid/extensions/ax"
-require "config/environment"
+require "environment"
require "lib/ruby_extensions"
require "lib/git_helper"
require "lib/git_diff_utils"
@@ -76,7 +76,7 @@ class Barkeep < Sinatra::Base
register Sinatra::Reloader
also_reload "lib/*.rb"
also_reload "models/*.rb"
- also_reload "config/environment.rb"
+ also_reload "environment.rb"
also_reload "resque_jobs/*.rb"
end
@@ -1,7 +1,7 @@
# Refer to http://unicorn.bogomips.org/Unicorn/Configurator.html for more info on options
# Refer to http://unicorn.bogomips.org/SIGNALS.html for how to change some of these at runtime
-require "./config/environment.rb"
+require "./environment.rb"
port = ENV["BARKEEP_PORT"] || 8040
listen port, :tcp_nodelay => true
@@ -2,7 +2,7 @@ Barkeep supports a read-only demo mode. The intention is to let people play with
log in. We use it in the demo Barkeep installation linked from getbarkeep.com. This README describes how it
works and how it's implemented.
-You can set `ENABLE_READONLY_DEMO_MODE = true` in `config/environment.rb`. `config/environment.rb` is
+You can set `ENABLE_READONLY_DEMO_MODE = true` in `environment.rb`. `environment.rb` is
supposed to be generated during deploy (if you're using Fezzik or Capistrano). `ENABLE_READONLY_DEMO_MODE` is
set to true for our development environments, but should be false for most production environments.
File renamed without changes.
@@ -3,7 +3,7 @@
require "bundler/setup"
require "pathological"
-require "config/environment"
+require "environment"
require "grit"
require "resque"
require "lib/ruby_extensions"
@@ -24,7 +24,7 @@
require "pathological"
require "terraform/dsl"
include Terraform::Dsl
-require "config/environment.rb"
+require "environment.rb"
def mysql_command() @mysql_command ||= (`which mysql || which mysql5`).chomp end
def mysqladmin_command() @mysql_admin ||= (`which mysqladmin || which mysqladmin5`).chomp end
@@ -7,7 +7,7 @@
require "resque_jobs/fetch_commits"
require "resque_jobs/batch_comment_emails"
require "resque_jobs/delete_old_comments_by_demo_users"
-require "config/environment"
+require "environment"
# The output of clockwork is not very useful in development. Toggle when debugging Clockwork.
ENABLE_CLOCKWORK_OUTPUT = (ENV["RACK_ENV"] == "production")
@@ -2,7 +2,7 @@
require "bundler/setup"
require "pathological"
-require "config/environment.rb"
+require "environment.rb"
PROTOCOL, DB_TYPE, DB_NAME, DB_HOST = DB_LOCATION.split(":")

0 comments on commit d1085e3

Please sign in to comment.