From 27b2355738482a2e470281136bfe902ad6c78db8 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 14 Jul 2017 03:51:17 +0200 Subject: Fix #3904 - Adjustable time period for mastodon:media:remove_remote via NUM_DAYS (#4191) --- lib/tasks/mastodon.rake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/tasks') diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index b2b352858..1b05ece33 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -85,9 +85,11 @@ namespace :mastodon do MediaAttachment.where(account: Account.silenced).find_each(&:destroy) end - desc 'Remove cached remote media attachments that are older than a week' + desc 'Remove cached remote media attachments that are older than NUM_DAYS. By default 7 (week)' task remove_remote: :environment do - MediaAttachment.where.not(remote_url: '').where('created_at < ?', 1.week.ago).find_each do |media| + time_ago = ENV.fetch('NUM_DAYS') { 7 }.to_i.days.ago + + MediaAttachment.where.not(remote_url: '').where('created_at < ?', time_ago).find_each do |media| media.file.destroy media.type = :unknown media.save -- cgit From 0fa9dd85273fed7f5412b9b1be21d8db7c5ed7bb Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Fri, 14 Jul 2017 19:13:43 +0900 Subject: Add Rake task for generate VAPID key (#4195) * Add Rake task for generate VAPID key * edit config/initializers/vapid.rb --- .env.production.sample | 2 +- config/initializers/vapid.rb | 2 +- lib/tasks/mastodon.rake | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/tasks') diff --git a/.env.production.sample b/.env.production.sample index faefa2482..eb1c5a48f 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -36,7 +36,7 @@ OTP_SECRET= # You should only generate this once per instance. If you later decide to change it, all push subscription will # be invalidated, requiring the users to access the website again to resubscribe. # -# ruby -e "require 'webpush'; vapid_key = Webpush.generate_key; puts vapid_key.private_key; puts vapid_key.public_key;" +# Generate with `rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose) # # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html VAPID_PRIVATE_KEY= diff --git a/config/initializers/vapid.rb b/config/initializers/vapid.rb index 74e07377c..618f5a3fb 100644 --- a/config/initializers/vapid.rb +++ b/config/initializers/vapid.rb @@ -6,7 +6,7 @@ Rails.application.configure do # You should only generate this once per instance. If you later decide to change it, all push subscription will # be invalidated, requiring the users to access the website again to resubscribe. # - # ruby -e "require 'webpush'; vapid_key = Webpush.generate_key; puts vapid_key.private_key; puts vapid_key.public_key;" + # Generate with `rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose) # # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 1b05ece33..010139e91 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -184,6 +184,15 @@ namespace :mastodon do end end + namespace :webpush do + desc 'Generate VAPID key' + task generate_vapid_key: :environment do + vapid_key = Webpush.generate_key + puts "VAPID_PRIVATE_KEY=#{vapid_key.private_key}" + puts "VAPID_PUBLIC_KEY=#{vapid_key.public_key}" + end + end + namespace :maintenance do desc 'Update counter caches' task update_counter_caches: :environment do -- cgit