diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-04-22 16:21:07 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-04-22 16:21:07 +0200 |
commit | d65ebee049207a702747c20151196c9625442a1b (patch) | |
tree | 357277fbbae92b775caff087e050ea471ff71c43 | |
parent | 0fc894fd25009ae9d284cff94edffd62a6348924 (diff) | |
parent | e89e896f4eb648d69fae2cfaa9c40c9944711556 (diff) | |
download | Puppet-d65ebee049207a702747c20151196c9625442a1b.tar.gz Puppet-d65ebee049207a702747c20151196c9625442a1b.tar.zst Puppet-d65ebee049207a702747c20151196c9625442a1b.zip |
Merge branch 'dev'
-rw-r--r-- | modules/profile/manifests/fstab.pp | 2 | ||||
-rw-r--r-- | modules/role/manifests/backup.pp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/profile/manifests/fstab.pp b/modules/profile/manifests/fstab.pp index 5f2e58e..8ecfe72 100644 --- a/modules/profile/manifests/fstab.pp +++ b/modules/profile/manifests/fstab.pp | |||
@@ -2,6 +2,8 @@ class profile::fstab ( | |||
2 | Optional[Array] $mounts = [] | 2 | Optional[Array] $mounts = [] |
3 | ) { | 3 | ) { |
4 | $mounts.each |$mount| { | 4 | $mounts.each |$mount| { |
5 | ensure_packages(["parted"]) | ||
6 | |||
5 | unless empty($mount) { | 7 | unless empty($mount) { |
6 | $infos = split($mount, ';') | 8 | $infos = split($mount, ';') |
7 | 9 | ||
diff --git a/modules/role/manifests/backup.pp b/modules/role/manifests/backup.pp index d01abd9..ab485b0 100644 --- a/modules/role/manifests/backup.pp +++ b/modules/role/manifests/backup.pp | |||
@@ -47,7 +47,7 @@ class role::backup ( | |||
47 | command => $backup_script, | 47 | command => $backup_script, |
48 | user => $user, | 48 | user => $user, |
49 | minute => 25, | 49 | minute => 25, |
50 | hour => 3, | 50 | hour => "3,15", |
51 | require => Concat[$backup_script], | 51 | require => Concat[$backup_script], |
52 | } | 52 | } |
53 | 53 | ||