kris/puppet-rsnapshot
1
0
Fork 0
mirror of https://github.com/krislamo/puppet-rsnapshot synced 2024-12-16 09:40:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'feature/create_run_dir-issue#12' into develop

Browse Source 
fix issue#12
This commit is contained in:
Norbert Varzariu 2017-04-24 20:04:17 +02:00
commit 94b890df6d
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/install.pp
View File

@ -10,5 +10,14 @@ class rsnapshot::install {
ensure => $rsnapshot::package_ensure, ensure => $rsnapshot::package_ensure,
} }
# ensure run directory exists (systemd clears /var/run, so rsnapshot can't create PID files after reboot - issue#12)
$lockpath = pick($rsnapshot::lockpath, $rsnapshot::params::config_lockpath, '/var/run/rsnapshot')
$tmpfiles_d = '/etc/tmpfiles.d'
file { "${tmpfiles_d}/rsnapshot.conf":
ensure => present,
content => "D ${lockpath} 0755 root root -",
}
} }

9
spec/acceptance/default_spec.rb
View File

@ -28,13 +28,20 @@ describe 'rsnapshot' do
end end
end end
context 'files provisioned' do context 'files provisioned' do
describe file('/etc/tmpfiles.d/rsnapshot.conf') do
it { is_expected.to exist }
its(:content) { is_expected.to match 'D /var/run/rsnapshot 0755 root root -' }
end
describe file('/var/run/rsnapshot') do
it { should be_directory }
end
describe file('/etc/rsnapshot/localhost.rsnapshot.conf') do describe file('/etc/rsnapshot/localhost.rsnapshot.conf') do
it { is_expected.to exist } it { is_expected.to exist }
its(:content) { is_expected.to match 'backup' } its(:content) { is_expected.to match 'backup' }
end end
describe file('/etc/rsnapshot/example.com.rsnapshot.conf') do describe file('/etc/rsnapshot/example.com.rsnapshot.conf') do
it { is_expected.to exist } it { is_expected.to exist }
its(:content) { is_expected.to match 'backup' } its(:content) { is_expected.to match 'backup\troot@example.com:/var/\t./' }
end end
describe file('/etc/rsnapshot.conf') do describe file('/etc/rsnapshot.conf') do
it { is_expected.to exist } it { is_expected.to exist }