From f59700138f7360436767fddea554c739e2cd484b Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 25 Sep 2012 08:55:35 +1000 Subject: Extract configuration with defaults into one module --- lib/configuration.rb | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 lib/configuration.rb (limited to 'lib/configuration.rb') diff --git a/lib/configuration.rb b/lib/configuration.rb new file mode 100644 index 000000000..ad9b52b4c --- /dev/null +++ b/lib/configuration.rb @@ -0,0 +1,65 @@ +# Configuration values with defaults + +# TODO: Make this return different values depending on the current rails environment + +module Configuration + DEFAULTS = { + :ADMIN_BASE_URL => '/admin/', + :ADMIN_PASSWORD => '', + :ADMIN_PUBLIC_URL => '', + :ADMIN_USERNAME => '', + :AVAILABLE_LOCALES => '', + :BLACKHOLE_PREFIX => 'do-not-reply-to-this-address', + :BLOG_FEED => '', + :CONTACT_EMAIL => 'contact@localhost', + :CONTACT_NAME => 'Alaveteli', + :COOKIE_STORE_SESSION_SECRET => 'this default is insecure as code is open source, please override for live sites in config/general; this will do for local development', + :DEBUG_RECORD_MEMORY => false, + :DEFAULT_LOCALE => '', + :DOMAIN => 'localhost:3000', + :EXCEPTION_NOTIFICATIONS_FROM => nil, + :EXCEPTION_NOTIFICATIONS_TO => nil, + :FORCE_REGISTRATION_ON_NEW_REQUEST => false, + :FORWARD_NONBOUNCE_RESPONSES_TO => 'user-support@localhost', + :FRONTPAGE_PUBLICBODY_EXAMPLES => '', + :GA_CODE => '', + :GAZE_URL => '', + :HTML_TO_PDF_COMMAND => nil, + :INCOMING_EMAIL_DOMAIN => 'localhost', + :INCOMING_EMAIL_PREFIX => '', + :INCOMING_EMAIL_SECRET => 'dummysecret', + :ISO_COUNTRY_CODE => 'GB', + :MAX_REQUESTS_PER_USER_PER_DAY => nil, + :NEW_RESPONSE_REMINDER_AFTER_DAYS => [3, 10, 24], + :RAW_EMAILS_LOCATION => 'files/raw_emails', + :READ_ONLY => '', + :RECAPTCHA_PRIVATE_KEY => 'x', + :RECAPTCHA_PUBLIC_KEY => 'x', + :REPLY_LATE_AFTER_DAYS => 20, + :REPLY_VERY_LATE_AFTER_DAYS => 40, + :SITE_NAME => 'Alaveteli', + :SKIP_ADMIN_AUTH => false, + :SPECIAL_REPLY_VERY_LATE_AFTER_DAYS => 60, + :THEME_URL => "", + :THEME_URLS => [], + :TRACK_SENDER_EMAIL => 'contact@localhost', + :TRACK_SENDER_NAME => 'Alaveteli', + :TWITTER_USERNAME => '', + :USE_DEFAULT_BROWSER_LANGUAGE => true, + :USE_GHOSTSCRIPT_COMPRESSION => nil, + # UTILITY_SEARCH_PATH isn't mentioned in general.yml-example + :UTILITY_SEARCH_PATH => ["/usr/bin", "/usr/local/bin"], + :VARNISH_HOST => nil, + :WORKING_OR_CALENDAR_DAYS => 'working', + } + + def Configuration.method_missing(name) + key = name.to_s.upcase + if DEFAULTS.has_key?(key.to_sym) + MySociety::Config.get(key, DEFAULTS[key.to_sym]) + else + super + end + end +end + -- cgit v1.2.3 From 5e3e0ae67f6afa0fa648b7015e89871bee22b23f Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 25 Sep 2012 09:02:59 +1000 Subject: Add undocumented UTILITY_SEARCH_PATH configuration to general.yml-example --- lib/configuration.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/configuration.rb') diff --git a/lib/configuration.rb b/lib/configuration.rb index ad9b52b4c..03ca62343 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -47,7 +47,6 @@ module Configuration :TWITTER_USERNAME => '', :USE_DEFAULT_BROWSER_LANGUAGE => true, :USE_GHOSTSCRIPT_COMPRESSION => nil, - # UTILITY_SEARCH_PATH isn't mentioned in general.yml-example :UTILITY_SEARCH_PATH => ["/usr/bin", "/usr/local/bin"], :VARNISH_HOST => nil, :WORKING_OR_CALENDAR_DAYS => 'working', -- cgit v1.2.3 From e8bebdba1f9ffc9e3704cfe80745dd9f5b7bab3e Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 2 Oct 2012 08:10:28 +1000 Subject: Use new Configuration for OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS --- lib/configuration.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/configuration.rb') diff --git a/lib/configuration.rb b/lib/configuration.rb index 03ca62343..e52f6e956 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -31,6 +31,7 @@ module Configuration :ISO_COUNTRY_CODE => 'GB', :MAX_REQUESTS_PER_USER_PER_DAY => nil, :NEW_RESPONSE_REMINDER_AFTER_DAYS => [3, 10, 24], + :OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS => '', :RAW_EMAILS_LOCATION => 'files/raw_emails', :READ_ONLY => '', :RECAPTCHA_PRIVATE_KEY => 'x', -- cgit v1.2.3 From 38a64203dd2e875e92c4bf4e5cd48ff59cd49526 Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Thu, 4 Oct 2012 14:58:01 +1000 Subject: Correct default value for ADMIN_BASE_URL Back in 008e64e7 it was changed so that you could just set a blank value instead of '/admin/', it looks like test.yml was never updated and somehow lib/configuration.rb started off with the old value too. --- lib/configuration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/configuration.rb') diff --git a/lib/configuration.rb b/lib/configuration.rb index 03ca62343..79dbccf71 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -4,7 +4,7 @@ module Configuration DEFAULTS = { - :ADMIN_BASE_URL => '/admin/', + :ADMIN_BASE_URL => '', :ADMIN_PASSWORD => '', :ADMIN_PUBLIC_URL => '', :ADMIN_USERNAME => '', -- cgit v1.2.3