X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7cf55dce1df774d2c3daa3e54c0d4f27c38d4b11..97403e08475b328115373a2c6a23e82116199aad:/services/api/lib/tasks/config_check.rake?ds=sidebyside

diff --git a/services/api/lib/tasks/config_check.rake b/services/api/lib/tasks/config_check.rake
index c9f12fc1a9..1b386556e6 100644
--- a/services/api/lib/tasks/config_check.rake
+++ b/services/api/lib/tasks/config_check.rake
@@ -2,7 +2,22 @@ namespace :config do
   desc 'Ensure site configuration has all required settings'
   task check: :environment do
     $application_config.sort.each do |k, v|
-      $stderr.puts "%-32s %s" % [k, eval("Rails.configuration.#{k}")]
+      if ENV.has_key?('QUIET') then
+        # Make sure we still check for the variable to exist
+        eval("Rails.configuration.#{k}")
+      else
+        if /(password|secret)/.match(k) then
+          # Make sure we still check for the variable to exist, but don't print the value
+          eval("Rails.configuration.#{k}")
+          $stderr.puts "%-32s %s" % [k, '*********']
+        else
+          $stderr.puts "%-32s %s" % [k, eval("Rails.configuration.#{k}")]
+        end
+      end
+    end
+    # default_trash_lifetime cannot be less than 24 hours
+    if Rails.configuration.default_trash_lifetime < 86400 then
+      raise "default_trash_lifetime is %d, must be at least 86400" % Rails.configuration.default_trash_lifetime
     end
   end
 end