From 0193fd2e6d156a6ceba4454f2ebbfefae0ec0245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Vizcaino?= Date: Sun, 29 Mar 2015 10:25:53 +0200 Subject: [PATCH] setup: set user/group explicitly for dirs & script --- manifests/setup.pp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/manifests/setup.pp b/manifests/setup.pp index 95cce4a16..82a082f52 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -35,9 +35,9 @@ $script_path = "${concatdir}/bin/${script_name}" - $script_owner = $::osfamily ? { 'windows' => undef, default => $::id } + $default_owner = $::osfamily ? { 'windows' => undef, default => $::id } - $script_group = $script_owner ? { 'root' => '0', default => undef } + $default_group = $default_owner ? { 'root' => '0', default => undef } $script_mode = $::osfamily ? { 'windows' => undef, default => '0755' } @@ -52,14 +52,16 @@ file { $script_path: ensure => file, - owner => $script_owner, - group => $script_group, + owner => $default_owner, + group => $default_group, mode => $script_mode, source => "puppet:///modules/concat/${script_name}", } file { [ $concatdir, "${concatdir}/bin" ]: ensure => directory, + owner => $default_owner, + group => $default_group, mode => '0755', } }