Commit 66c86a250f960a5faad266da5152ddc1d6b50337
1 parent
f42750b6
Bump to v0.4.1. Fix backup script bug.
Showing
4 changed files
with
14 additions
and
32 deletions
... | ... | @@ -49,34 +49,10 @@ Ubuntu 14.04 |
49 | 49 | <td><tt>'example-bucket'</tt></td> |
50 | 50 | </tr> |
51 | 51 | <tr> |
52 | - <td><tt>['cfe-mariadb']['backup']['cron']['min']</tt></td> | |
52 | + <td><tt>['cfe-mariadb']['backup']['cron']['sched']</tt></td> | |
53 | 53 | <td>String</td> |
54 | - <td>The backup cronjob 'minute' value</td> | |
55 | - <td><tt>'0'</tt></td> | |
56 | - </tr> | |
57 | - <tr> | |
58 | - <td><tt>['cfe-mariadb']['backup']['cron']['hour']</tt></td> | |
59 | - <td>String</td> | |
60 | - <td>The backup cronjob 'hour' value</td> | |
61 | - <td><tt>'0'</tt></td> | |
62 | - </tr> | |
63 | - <tr> | |
64 | - <td><tt>['cfe-mariadb']['backup']['cron']['day']</tt></td> | |
65 | - <td>String</td> | |
66 | - <td>The backup cronjob 'day of month' value</td> | |
67 | - <td><tt>'*'</tt></td> | |
68 | - </tr> | |
69 | - <tr> | |
70 | - <td><tt>['cfe-mariadb']['backup']['cron']['mon']</tt></td> | |
71 | - <td>String</td> | |
72 | - <td>The backup cronjob 'month' value</td> | |
73 | - <td><tt>'*'</tt></td> | |
74 | - </tr> | |
75 | - <tr> | |
76 | - <td><tt>['cfe-mariadb']['backup']['cron']['wday']</tt></td> | |
77 | - <td>String</td> | |
78 | - <td>The backup cronjob 'day of week' value</td> | |
79 | - <td><tt>'*'</tt></td> | |
54 | + <td>The backup cronjob schedule value in crontab syntax.</td> | |
55 | + <td><tt>'0 0 * * *'</tt></td> | |
80 | 56 | </tr> |
81 | 57 | <tr> |
82 | 58 | <td><tt>['cfe-mariadb']['reload']['aws_access_key_id']</tt></td> | ... | ... |
... | ... | @@ -4,7 +4,7 @@ maintainer_email 'sysadmin @ chromedia.com' |
4 | 4 | license 'Apache License' |
5 | 5 | description 'Simplifies setup of MariaDB in Chromedia.' |
6 | 6 | long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) |
7 | -version '0.4.0' | |
7 | +version '0.4.1' | |
8 | 8 | |
9 | 9 | { |
10 | 10 | 'mariadb' => '0.3.1', | ... | ... |
... | ... | @@ -108,7 +108,6 @@ upload_to_s3() { |
108 | 108 | |
109 | 109 | # First, perform mysqldump on each database (and encrypt if desired): |
110 | 110 | |
111 | -<% bfname = '' -%> | |
112 | 111 | <% @db_map.each do |db| -%> |
113 | 112 | <% if db.is_a?(Array) -%> |
114 | 113 | <% db_name = db[0] -%> |
... | ... | @@ -119,10 +118,7 @@ upload_to_s3() { |
119 | 118 | export_db <%= db_name %> <%= db[:db_user] %> '<%= db[:db_pass] %>' <%= db[:bak_filename] %> |
120 | 119 | compress_backup_file <%= db[:bak_filename] %> |
121 | 120 | <% if db[:bak_encrypted] -%> |
122 | -<% bfname = "#{db[:bak_filename]}.gz.enc" -%> | |
123 | 121 | encrypt_file <%= db[:bak_filename] %>.gz |
124 | -<% else -%> | |
125 | -<% bfname = "#{db[:bak_filename]}.gz" -%> | |
126 | 122 | <% end -%> |
127 | 123 | <% end -%> |
128 | 124 | |
... | ... | @@ -130,6 +126,11 @@ encrypt_file <%= db[:bak_filename] %>.gz |
130 | 126 | |
131 | 127 | <% @db_map.each do |db| -%> |
132 | 128 | <% if db.is_a?(Array) then db = db[1] end -%> |
129 | +<% if db[:bak_encrypted] -%> | |
130 | +<% bfname = "#{db[:bak_filename]}.gz.enc" -%> | |
131 | +<% else -%> | |
132 | +<% bfname = "#{db[:bak_filename]}.gz" -%> | |
133 | +<% end -%> | |
133 | 134 | increment_backup_names <%= bfname %> <%= db[:bak_maxcopies] %> |
134 | 135 | upload_to_s3 <%= bfname %> |
135 | 136 | ... | ... |