Merge branch 'master' into fix-3278

config/application.rb

@@ -30,11 +30,6 @@ module Danbooru
       config.x.git_hash = nil
     end
 
-    if ENV["DANBOORU_RAKISMET_KEY"]
-      config.rakismet.key = ENV["DANBOORU_RAKISMET_KEY"]
-      config.rakismet.url = ENV["DANBOORU_RAKISMET_URL"]
-    end
-
     config.after_initialize do
       Rails.application.routes.default_url_options = {
         host: Danbooru.config.hostname,

config/danbooru_default_config.rb

@@ -619,6 +619,13 @@ module Danbooru
 
     def aws_sqs_cropper_url
     end
+
+    # Akismet API key. Used for Dmail spam detection. http://akismet.com/signup/
+    def rakismet_key
+    end
+
+    def rakismet_url
+    end
   end
 
   class EnvironmentConfiguration

config/initializers/rakismet.rb

@@ -0,0 +1,2 @@
+Rails.application.config.rakismet.key = Danbooru.config.rakismet_key
+Rails.application.config.rakismet.url = Danbooru.config.rakismet_url