fix s3 scripts
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
require 'base64'
|
rerequire 'base64'
|
||||||
require 'digest/md5'
|
require 'digest/md5'
|
||||||
|
|
||||||
class AmazonBackup < ActiveRecord::Base
|
class AmazonBackup < ActiveRecord::Base
|
||||||
@@ -15,12 +15,16 @@ class AmazonBackup < ActiveRecord::Base
|
|||||||
def self.execute
|
def self.execute
|
||||||
last_id = AmazonBackup.last_id
|
last_id = AmazonBackup.last_id
|
||||||
credentials = Aws::Credentials.new(Danbooru.config.amazon_s3_access_key_id, Danbooru.config.amazon_s3_secret_access_key)
|
credentials = Aws::Credentials.new(Danbooru.config.amazon_s3_access_key_id, Danbooru.config.amazon_s3_secret_access_key)
|
||||||
client = Aws::S3::Client.new(region: "us-west-2", credentials: credentials)
|
Aws.config.update({
|
||||||
|
region: "us-east-1",
|
||||||
|
credentials: credentials
|
||||||
|
})
|
||||||
|
client = Aws::S3::Client.new
|
||||||
bucket = Danbooru.config.amazon_s3_bucket_name
|
bucket = Danbooru.config.amazon_s3_bucket_name
|
||||||
|
|
||||||
Post.where("id > ?", last_id).limit(1000).order("id").each do |post|
|
Post.where("id > ?", last_id).limit(1000).order("id").each do |post|
|
||||||
if File.exists?(post.file_path)
|
if File.exists?(post.file_path)
|
||||||
base64_md5 = Base64.encode64(Digest::MD5.digest(File.read(post.file_path)))
|
base64_md5 = Digest::MD5.base64digest(File.read(post.file_path))
|
||||||
key = File.basename(post.file_path)
|
key = File.basename(post.file_path)
|
||||||
body = open(post.file_path, "rb")
|
body = open(post.file_path, "rb")
|
||||||
client.put_object(bucket: bucket, key: key, body: body, content_md5: base64_md5)
|
client.put_object(bucket: bucket, key: key, body: body, content_md5: base64_md5)
|
||||||
|
|||||||
@@ -19,8 +19,12 @@ end
|
|||||||
|
|
||||||
access_key = open("#{home}/.s3/access_key").read.strip
|
access_key = open("#{home}/.s3/access_key").read.strip
|
||||||
secret_access_key = open("#{home}/.s3/secret_access_key").read.strip
|
secret_access_key = open("#{home}/.s3/secret_access_key").read.strip
|
||||||
credentials = Aws::Credentials.new(access_key, secret_access_key)
|
credentials = Aws::Credentials.new(Danbooru.config.amazon_s3_access_key_id, Danbooru.config.amazon_s3_secret_access_key)
|
||||||
client = Aws::S3::Client.new(region: "us-west-2", credentials: credentials)
|
Aws.config.update({
|
||||||
|
region: "us-east-1",
|
||||||
|
credentials: credentials
|
||||||
|
})
|
||||||
|
client = Aws::S3::Client.new
|
||||||
bucket = "danbooru-backup"
|
bucket = "danbooru-backup"
|
||||||
|
|
||||||
current_backups = client.list_objects(buckets: buckets).contents.map {|x| x.key}.select {|x| x =~ /^db-/}.sort.reverse
|
current_backups = client.list_objects(buckets: buckets).contents.map {|x| x.key}.select {|x| x =~ /^db-/}.sort.reverse
|
||||||
|
|||||||
Reference in New Issue
Block a user