aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-09-12 14:27:10 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-09-12 14:27:10 -0300
commit61e2ea8022db09965fd3e13304b3ad6e980278de (patch)
tree46ef92f5d19fb4fabf92db6b6c147fd557c6b8f3 /manifests
parent62f4491bd2cc48e308384333d5fb36ca745f1686 (diff)
downloadpuppet-virtual-61e2ea8022db09965fd3e13304b3ad6e980278de.tar.gz
puppet-virtual-61e2ea8022db09965fd3e13304b3ad6e980278de.tar.bz2
Qualify grep and switch to file_line
Diffstat (limited to 'manifests')
-rw-r--r--manifests/vserver.pp2
-rw-r--r--manifests/vserver/cflags.pp4
-rw-r--r--manifests/vserver/host.pp4
3 files changed, 5 insertions, 5 deletions
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 991bebd..a650c35 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -64,7 +64,7 @@ define virtual::vserver(
# we have to do it for each vserver, see
# http://linux-vserver.org/Secure_chroot_Barrier#Solution:_Secure_Barrier
exec { "/usr/sbin/setattr --barrier /etc/vservers/${vs_name}/vdir/../":
- unless => "/usr/sbin/showattr /etc/vservers/${vs_name}/vdir/../ | grep -- '----Bui- /etc/vservers/${vs_name}/vdir/../$'",
+ unless => "/usr/sbin/showattr /etc/vservers/${vs_name}/vdir/../ | /bin/grep -- '----Bui- /etc/vservers/${vs_name}/vdir/../$'",
require => Exec["vserver_instance_${vs_name}"],
}
diff --git a/manifests/vserver/cflags.pp b/manifests/vserver/cflags.pp
index 462c9e4..92c4040 100644
--- a/manifests/vserver/cflags.pp
+++ b/manifests/vserver/cflags.pp
@@ -5,9 +5,9 @@ define virtual::vserver::cflags($vserver, $flag, $ensure = present) {
}
}
- line {"vs_cflags-${vserver}-${flag}":
+ file_line {"vs_cflags-${vserver}-${flag}":
ensure => $ensure,
- file => "/etc/vservers/${vserver}/cflags",
+ path => "/etc/vservers/${vserver}/cflags",
line => "${flag}",
require => Exec["vserver_instance_${vserver}"],
notify => Exec["vattribute-${vserver}-${flag}"],
diff --git a/manifests/vserver/host.pp b/manifests/vserver/host.pp
index 69718dd..081fd07 100644
--- a/manifests/vserver/host.pp
+++ b/manifests/vserver/host.pp
@@ -57,8 +57,8 @@ class virtual::vserver::host($vdirbase = "/var/lib/vservers") {
}
# remove dummy interfaces on the host
- line { modules_dummy:
- file => "/etc/modules",
+ file_line { modules_dummy:
+ path => "/etc/modules",
line => "^dummy",
ensure => absent,
}