mirror of
https://github.com/krislamo/puppet-rsnapshot
synced 2025-04-29 22:04:20 +00:00
Compare commits
No commits in common. "master" and "1.2.2" have entirely different histories.
@ -329,7 +329,7 @@ Default is:
|
||||
monthly => {
|
||||
minute => '0..59',
|
||||
hour => '0..23', # you could also do: ['21..23','0..4','5'],
|
||||
monthday => '1..28',
|
||||
monthday => '0..28',
|
||||
month => '*',
|
||||
weekday => '*',
|
||||
},
|
||||
|
@ -103,7 +103,6 @@ class rsnapshot::config (
|
||||
if ! ( $interval and $retain ) {
|
||||
$interval = pick($hash['interval'], $rsnapshot::params::config_interval)
|
||||
}
|
||||
|
||||
# rsnapshot wants numeric values
|
||||
if $link_dest {
|
||||
$link_dest_num = bool2num($link_dest)
|
||||
@ -114,9 +113,6 @@ class rsnapshot::config (
|
||||
if $use_lazy_deletes {
|
||||
$use_lazy_deletes_num = bool2num($use_lazy_deletes)
|
||||
}
|
||||
if $one_fs {
|
||||
$one_fs_num = bool2num($one_fs)
|
||||
}
|
||||
|
||||
$real_include = $rsnapshot::include + $include
|
||||
unless empty($real_include) {
|
||||
|
@ -13,11 +13,7 @@ class rsnapshot::install {
|
||||
# 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}":
|
||||
ensure => directory,
|
||||
}
|
||||
|
||||
|
||||
file { "${tmpfiles_d}/rsnapshot.conf":
|
||||
ensure => present,
|
||||
content => "D ${lockpath} 0755 root root -",
|
||||
|
@ -96,7 +96,7 @@ class rsnapshot::params {
|
||||
monthly => {
|
||||
minute => '0..59',
|
||||
hour => '0..23', # you could also do: ['21..23','0..4','5'],
|
||||
monthday => '1..28',
|
||||
monthday => '0..28',
|
||||
month => '*',
|
||||
weekday => '*',
|
||||
},
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "loomsen-rsnapshot",
|
||||
"version": "1.2.5",
|
||||
"version": "1.2.2",
|
||||
"author": "loomsen",
|
||||
"summary": "Configures rsnapshot.",
|
||||
"license": "Apache-2.0",
|
||||
|
@ -28,9 +28,6 @@ describe 'rsnapshot' do
|
||||
end
|
||||
end
|
||||
context 'files provisioned' do
|
||||
describe file('/etc/tmpfiles.d') do
|
||||
it { should be_directory }
|
||||
end
|
||||
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 -' }
|
||||
|
Loading…
x
Reference in New Issue
Block a user