aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/environment.rb2
-rw-r--r--config/general-example6
-rw-r--r--config/routes.rb3
3 files changed, 9 insertions, 2 deletions
diff --git a/config/environment.rb b/config/environment.rb
index 4325def66..807ee4982 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -61,6 +61,8 @@ Rails::Initializer.run do |config|
config.active_record.default_timezone = :utc
# See Rails::Configuration for more options
+ ENV['RECAPTCHA_PUBLIC_KEY'] = MySociety::Config::get("RECAPTCHA_PUBLIC_KEY")
+ ENV['RECAPTCHA_PRIVATE_KEY'] = MySociety::Config::get("RECAPTCHA_PRIVATE_KEY")
end
# Add new inflection rules using the following format
diff --git a/config/general-example b/config/general-example
index 2a7a0b140..e766293cc 100644
--- a/config/general-example
+++ b/config/general-example
@@ -19,7 +19,7 @@
* Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
* Email: francis@mysociety.org; WWW: http://www.mysociety.org
*
- * $Id: general-example,v 1.15 2008-06-12 13:43:30 francis Exp $
+ * $Id: general-example,v 1.16 2008-10-17 11:38:00 francis Exp $
*
*/
@@ -42,4 +42,8 @@ define('OPTION_ADMIN_PUBLIC_URL', '/'); // where /stylesheets sits under for adm
// Secret key for signing cookie_store sessions
define('OPTION_COOKIE_STORE_SESSION_SECRET', 'your secret key here, make it long and random');
+// Recaptcha, for detecting humans. Get keys here: http://recaptcha.net/whyrecaptcha.html
+define('OPTION_RECAPTCHA_PUBLIC_KEY', '');
+define('OPTION_RECAPTCHA_PRIVATE_KEY', '');
+
?>
diff --git a/config/routes.rb b/config/routes.rb
index d93d7004d..edda39af1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: routes.rb,v 1.74 2008-09-15 16:16:35 francis Exp $
+# $Id: routes.rb,v 1.75 2008-10-17 11:38:00 francis Exp $
ActionController::Routing::Routes.draw do |map|
@@ -60,6 +60,7 @@ ActionController::Routing::Routes.draw do |map|
body.list_public_bodies "/body", :action => 'list'
body.list_public_bodies "/body/list/:tag", :action => 'list'
body.show_public_body "/body/:url_name", :action => 'show'
+ body.view_public_body_email "/body/:url_name/view_email", :action => 'view_email'
end
map.with_options :controller => 'comment' do |comment|