diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 3 | ||||
| -rw-r--r-- | config/general-example | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/config/environment.rb b/config/environment.rb index 14bf2658e..548db1b72 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -11,7 +11,8 @@ RAILS_GEM_VERSION = '1.2.1' unless defined? RAILS_GEM_VERSION require File.join(File.dirname(__FILE__), 'boot') # MySociety specific helper functions -$:.push("../rblib") +$:.push(File.join(File.dirname(__FILE__), '../../rblib')) + load "validate.rb" load "config.rb" diff --git a/config/general-example b/config/general-example index 6e8f3e0bb..6b860cd8d 100644 --- a/config/general-example +++ b/config/general-example @@ -10,11 +10,16 @@ * * Copy this file to one called "general" in the same directory. Or * have multiple config files and use a symlink to change between them. + * + * NOTE ON USE IN RAILS: So that people don't have to have PHP installed just + * to run this stuff, by convention we always provide a default config value + * in the source code when reading the config option. The Rails application + * should run fine without the general config file, it is a bug if it does not. * * Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. * Email: francis@mysociety.org; WWW: http://www.mysociety.org * - * $Id: general-example,v 1.3 2007-11-05 16:46:11 francis Exp $ + * $Id: general-example,v 1.4 2007-11-13 12:02:16 francis Exp $ * */ |