Page MenuHomeGRNET
Files F886117

No OneTemporary
Actions

File Metadata

Created
Fri, Aug 8, 8:44 PM

View Options

diff --git a/config/initializers/00_settings.rb b/config/initializers/00_settings.rb
index 5216419..6ac230a 100644
--- a/config/initializers/00_settings.rb
+++ b/config/initializers/00_settings.rb
@@ -1,50 +1,52 @@
WebDNS.settings[:soa_defaults] = {
primary_ns: 'ns1.example.com',
contact: 'domainmaster@example.com',
serial: 1,
refresh: 10_800,
retry: 3600,
expire: 604_800,
nx: 3600
}
WebDNS.settings[:default_ns] = [
'ns1.example.com',
'ns2.example.com'
]
WebDNS.settings[:dnssec] = true
WebDNS.settings[:dnssec_parent_authorities] = {
webdns: {
valid: -> (parent) { Domain.find_by_name(parent) } # Check if parent is self-hosted
},
papaki: {
valid: -> (parent) { parent.split('.').size == 1 } # TLDs
}
}
WebDNS.settings[:dnssec_ds_removal_sleep] = 14400 * 2
# Testing helper
WebDNS.settings[:dnssec_parent_authorities].merge!(
test_authority: {
valid: -> (parent) { true }
}
) if Rails.env.test?
WebDNS.settings[:serial_strategy] = Strategies::Date
WebDNS.settings[:prohibit_records_types] = []
WebDNS.settings[:prohibit_domain_types] = ['NATIVE']
WebDNS.settings[:contact_mail] = 'webdns@example.com'
WebDNS.settings[:mail_from] = 'webdns@example.com'
WebDNS.settings[:admin_group] = 'admin'
WebDNS.settings[:saml] = false
WebDNS.settings[:saml_required_entitlement] = 'webdns'
WebDNS.settings[:saml_login_text] = 'Login with SAML'
WebDNS.settings[:api] = true
+WebDNS.settings[:completed_jobs_count] = 1000
+
# Allow local overrides
local_settings = File.expand_path('../../local_settings.rb', __FILE__)
require_relative local_settings if File.exist?(local_settings)
diff --git a/lib/tasks/cleanup.rake b/lib/tasks/cleanup.rake
index e38794a..9aaf91e 100644
--- a/lib/tasks/cleanup.rake
+++ b/lib/tasks/cleanup.rake
@@ -1,12 +1,14 @@
namespace :cleanup do
desc "Cleanup completed jobs"
task :jobs => :environment do
- Job.completed.destroy_all
+ count = Job.completed.count - WebDNS.settings[:completed_jobs_count]
+ count = count < 0 ? 0 : count
+ Job.completed.order(created_at: :desc).limit(count).destroy_all
end
# add new jobs here too
task :all => [:jobs]
end
desc "Cleanup everything"
task :cleanup => 'cleanup:all'

Event Timeline