mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-26 02:01:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow modifying IP retention period

Browse source 
To allow IP addresses to not be stored for an entire year.
This attempts to fix https://github.com/mastodon/mastodon/issues/6474 for Catstodon.
This commit is contained in:
Jeremy Kescher 2022-06-27 00:09:17 +02:00
parent 06b9e14a03
commit 97d03110ed
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.env.production.sample
View file

@ -286,6 +286,14 @@ MAX_POLL_OPTION_CHARS=100
MAX_EMOJI_SIZE=51200 MAX_EMOJI_SIZE=51200
MAX_REMOTE_EMOJI_SIZE=204800 MAX_REMOTE_EMOJI_SIZE=204800
# IP retention period
# If undefined, the value of 31556952 (1 average year) will be used.
# Keep in mind that this is period will not be completely accurate
# and may have a delay of up to 24 hours on vanilla and glitch-soc Mastodon
# due to the scheduling of ip_cleanup_scheduler in sidekiq.yml.
# Time unit in seconds
IP_RETENTION_PERIOD=31556952
# Optional hCaptcha support # Optional hCaptcha support
# HCAPTCHA_SECRET_KEY= # HCAPTCHA_SECRET_KEY=
# HCAPTCHA_SITE_KEY= # HCAPTCHA_SITE_KEY=

2
app/workers/scheduler/ip_cleanup_scheduler.rb
View file

@ -3,7 +3,7 @@
class Scheduler::IpCleanupScheduler class Scheduler::IpCleanupScheduler
include Sidekiq::Worker include Sidekiq::Worker
IP_RETENTION_PERIOD = 1.year.freeze IP_RETENTION_PERIOD = ENV.fetch('IP_RETENTION_PERIOD', 1.year).to_i.freeze
sidekiq_options retry: 0 sidekiq_options retry: 0

2
config/sidekiq.yml
View file

@ -46,7 +46,7 @@
class: Scheduler::UserCleanupScheduler class: Scheduler::UserCleanupScheduler
queue: scheduler queue: scheduler
ip_cleanup_scheduler: ip_cleanup_scheduler:
cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *' every: '1h'
class: Scheduler::IpCleanupScheduler class: Scheduler::IpCleanupScheduler
queue: scheduler queue: scheduler
email_scheduler: email_scheduler: