s3-mysql-backup 2.2.1 → 2.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -0
- data/lib/s3_mysql_backup.rb +6 -6
- data/lib/s3utils.rb +11 -15
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 327d3200cef39203bdb710f10de493c3c7c2fcfe
|
4
|
+
data.tar.gz: e2e26bacf36acc92a065512dbd7c3e0224428e39
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 10ba28fda0abf41d7f9ec511a49831073df818a60b44fe707dd74aa816878636508ba0360831d1a200e2fd4cc6372d1007eac93eb964e3cd329c926971a91648
|
7
|
+
data.tar.gz: 050f63437e15a69f5687f991ab7e91685c1411f526c26a9839b16d9f48605bd3980ff1c748751878917d98680a427b32e0cba1b835b1b62efa7b9cdb387556cf
|
data/README.md
CHANGED
@@ -40,6 +40,7 @@ remote_dir: /path/to/remote/backups
|
|
40
40
|
# s3_secret_access_key your Amazon S3 secret_access_key
|
41
41
|
# s3_bucket your Amazon S3 bucket for the backups
|
42
42
|
# s3_server OPTIONAL, your non-Amazon S3-compatible server
|
43
|
+
# s3_region: us-west-2 OPTIONAL, your aws region when not using the default
|
43
44
|
s3_access_key_id: my-key
|
44
45
|
s3_secret_access_key: my-secret
|
45
46
|
s3_bucket: my-bucket
|
data/lib/s3_mysql_backup.rb
CHANGED
@@ -47,7 +47,7 @@ class S3MysqlBackup
|
|
47
47
|
end
|
48
48
|
|
49
49
|
def connect_to_s3
|
50
|
-
@s3utils ||= S3Utils.new(config['s3_access_key_id'], config['s3_secret_access_key'], config['s3_bucket'], config['s3_server'])
|
50
|
+
@s3utils ||= S3Utils.new(config['s3_access_key_id'], config['s3_secret_access_key'], config['s3_bucket'], config['s3_server'], config['s3_region'])
|
51
51
|
end
|
52
52
|
|
53
53
|
# make the DB backup file
|
@@ -90,11 +90,11 @@ class S3MysqlBackup
|
|
90
90
|
smtp = Net::SMTP.new(config["mail_domain"], config["mail_port"])
|
91
91
|
smtp.enable_starttls unless config["mail_start_tls"] == false
|
92
92
|
smtp.start(
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
93
|
+
config["mail_domain"].to_s,
|
94
|
+
config['mail_user'].to_s,
|
95
|
+
config['mail_pass'].to_s,
|
96
|
+
config['mail_authentication'].to_s
|
97
|
+
) do
|
98
98
|
smtp.send_message(content, mail_from, config['mail_to'])
|
99
99
|
end
|
100
100
|
end
|
data/lib/s3utils.rb
CHANGED
@@ -4,9 +4,9 @@ require 'aws-sdk'
|
|
4
4
|
#
|
5
5
|
class S3Utils
|
6
6
|
|
7
|
-
def initialize(access_key_id, secret_access_key, bucket_name, server
|
7
|
+
def initialize(access_key_id, secret_access_key, bucket_name, server,region)
|
8
8
|
@bucket_name = bucket_name
|
9
|
-
@s3_connection = connect(access_key_id, secret_access_key,
|
9
|
+
@s3_connection = connect(access_key_id, secret_access_key,server, region)
|
10
10
|
@s3_bucket = get_or_create_bucket
|
11
11
|
self
|
12
12
|
end
|
@@ -28,19 +28,15 @@ class S3Utils
|
|
28
28
|
|
29
29
|
protected
|
30
30
|
|
31
|
-
def connect(access_key_id, secret_access_key, server=nil)
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
:secret_access_key => secret_access_key,
|
41
|
-
:server => server
|
42
|
-
)
|
43
|
-
end
|
31
|
+
def connect(access_key_id, secret_access_key, server=nil, region=nil)
|
32
|
+
options={}
|
33
|
+
options[:access_key_id]=access_key_id
|
34
|
+
options[:secret_access_key]= secret_access_key
|
35
|
+
options[:server]= server unless server.nil?
|
36
|
+
options[:region]= region unless region.nil?
|
37
|
+
|
38
|
+
AWS::S3::new(options)
|
39
|
+
|
44
40
|
end
|
45
41
|
|
46
42
|
def get_or_create_bucket
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: s3-mysql-backup
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.2.
|
4
|
+
version: 2.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jeff Emminger
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-10-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk
|