1
0
mirror of https://github.com/krislamo/puppet-rsnapshot synced 2024-12-16 09:40:35 +00:00

Merge pull request #3 from jhoblitt/plumbing/updates

plumbing updates to get tests working
This commit is contained in:
Norbert Varzariu 2016-12-21 22:18:54 +01:00 committed by GitHub
commit 3dea0ba9e1
3 changed files with 5 additions and 1 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
.bundle
Gemfile.lock

View File

@ -1,5 +1,7 @@
require 'spec_helper' require 'spec_helper'
describe 'rsnapshot' do describe 'rsnapshot' do
let(:facts) {{ :osfamily => 'RedHat' }}
it { should contain_class('rsnapshot::params') } it { should contain_class('rsnapshot::params') }
it { is_expected.to compile } it { is_expected.to compile }
end end

View File

@ -16,7 +16,7 @@ dbs=(
) )
<%end-%> <%end-%>
for db in "${dbs[@]}"; do for db in "${dbs[@]}"; do
<% if (@dbbackup_user == 'root' && @dbbackup_password = '' )-%> <% if (@dbbackup_user == 'root' && @dbbackup_password == '' )-%>
ssh -l <%=@backup_user-%> "$host" "<%=@dumper-%> <%=@dump_flags-%> ${db}" > "$db".sql ssh -l <%=@backup_user-%> "$host" "<%=@dumper-%> <%=@dump_flags-%> ${db}" > "$db".sql
<%else-%> <%else-%>
ssh -l <%=@backup_user-%> "$host" "<%=@dumper-%> --user=<%=@dbbackup_user-%> --password='<%=@dbbackup_password-%>' <%=@dump_flags-%> ${db}" > "$db".sql ssh -l <%=@backup_user-%> "$host" "<%=@dumper-%> --user=<%=@dbbackup_user-%> --password='<%=@dbbackup_password-%>' <%=@dump_flags-%> ${db}" > "$db".sql