From 0b807da215eadc363e9c9f67d5da37c034cf73dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:21:59 +0100 Subject: Fix augeas::lens with new module organization --- manifests/lens.pp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'manifests/lens.pp') diff --git a/manifests/lens.pp b/manifests/lens.pp index 55dc9ae..db65d11 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -31,10 +31,12 @@ define augeas::lens ( ) { if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - include augeas::base + if !declared(Class['augeas']) { + fail('You must declare the augeas class before using augeas::lens') + } - $lens_dest = "${augeas::base::lens_dir}/${name}.aug" - $test_dest = "${augeas::base::lens_dir}/tests/test_${name}.aug" + $lens_dest = "${augeas::lens_dir}/${name}.aug" + $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" file { $lens_dest: ensure => $ensure, @@ -42,7 +44,7 @@ define augeas::lens ( } exec { "Typecheck lens ${name}": - command => "augparse -I ${augeas::base::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", + command => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", refreshonly => true, subscribe => File[$lens_dest], } @@ -55,7 +57,7 @@ define augeas::lens ( } exec { "Test lens ${name}": - command => "augparse -I ${augeas::base::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", + command => "augparse -I ${augeas::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", refreshonly => true, subscribe => File[$lens_dest, $test_dest], } -- cgit v1.2.3 From 9ecff9bf6ea2606e70e0244bcd7ed1a466c87e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:24:14 +0100 Subject: Use defined instead of declared --- manifests/lens.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/lens.pp') diff --git a/manifests/lens.pp b/manifests/lens.pp index db65d11..f4d2ba2 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -31,7 +31,7 @@ define augeas::lens ( ) { if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - if !declared(Class['augeas']) { + if !defined(Class['augeas']) { fail('You must declare the augeas class before using augeas::lens') } -- cgit v1.2.3 From 461deeeebf4336fe485f566083813e9d1ac3f9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 20:39:38 +0100 Subject: Fix augeas::lens --- manifests/lens.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests/lens.pp') diff --git a/manifests/lens.pp b/manifests/lens.pp index f4d2ba2..723f217 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -29,11 +29,11 @@ define augeas::lens ( $test_source=false, $stock_since=false, ) { + if !defined(Class['augeas']) { + fail('You must declare the augeas class before using augeas::lens') + } - if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - if !defined(Class['augeas']) { - fail('You must declare the augeas class before using augeas::lens') - } + if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From bcd9746bff9a54016077a93e359b66f1e104b926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 18 Mar 2013 11:57:30 +0100 Subject: Use validate_re to check $augeas::lens_dir in augeas::lens --- manifests/lens.pp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'manifests/lens.pp') diff --git a/manifests/lens.pp b/manifests/lens.pp index 723f217..def3768 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -35,6 +35,8 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { + validate_re($augeas::lens_dir, '/.*', '$augeas::lens_dir must be a valid path') + $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From ded6f67c399d31d6b3d6d5d7295bfad0cf786102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 18 Mar 2013 14:12:16 +0100 Subject: Make validate_re message clearer in augeas::lens --- manifests/lens.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/lens.pp') diff --git a/manifests/lens.pp b/manifests/lens.pp index def3768..06db221 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -35,7 +35,7 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { - validate_re($augeas::lens_dir, '/.*', '$augeas::lens_dir must be a valid path') + validate_re($augeas::lens_dir, '/.*', "'${augeas::lens_dir}' is not a valid path for lens ${name}") $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From 0c6ca2848fbbe849a3e59779ffeb2c7979c6b0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 22 Mar 2013 10:09:35 +0100 Subject: Doc and lint --- manifests/lens.pp | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'manifests/lens.pp') diff --git a/manifests/lens.pp b/manifests/lens.pp index 06db221..ac4fddf 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -1,28 +1,25 @@ -/* - -== Definition: augeas::lens - -Deploy an Augeas lens (and its test file). -Check the lens (and run the unit tests) automatically and remove the files if -the checks fail. - -Parameters: -- *ensure*: present/absent -- *lens_source*: the source for the lens -- *test_source*: optionally, the source for the test file. -- *stock_since*: optionally, indicate in which version of Augeas - the lens became stock, so it will not be deployed above that version. - -Example usage: - - augeas::lens { 'networkmanager': - lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', - test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', - stock_since => '1.0.0', - } - -*/ - +# Definition: augeas::lens +# +# Deploy an Augeas lens (and its test file). +# Check the lens (and run the unit tests) automatically and remove the files if +# the checks fail. +# +# Parameters: +# ['ensure'] - present/absent +# ['lens_source'] - the source for the lens +# ['test_source'] - optionally, the source for the test file. +# ['stock_since'] - optionally, indicate in which version of Augeas +# the lens became stock, so it will not be deployed +# above that version. +# +# Example usage: +# +# augeas::lens { 'networkmanager': +# lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', +# test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', +# stock_since => '1.0.0', +# } +# define augeas::lens ( $lens_source, $ensure=present, @@ -35,7 +32,11 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { - validate_re($augeas::lens_dir, '/.*', "'${augeas::lens_dir}' is not a valid path for lens ${name}") + validate_re( + $augeas::lens_dir, + '/.*', + "'${augeas::lens_dir}' is not a valid path for lens ${name}" + ) $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From 53ab6b124272d9876b6f1b782c4fc38f791c56b8 Mon Sep 17 00:00:00 2001 From: Lienhart Woitok Date: Mon, 14 Oct 2013 18:24:24 +0200 Subject: Ensure lenses are owned by root This is necessary as lenses are fetched with file via puppet urls. This leads to whoever ownes the files on the puppet master owns the files on the node. This may lead to arbitrary users owning the lenses. See http://projects.puppetlabs.com/issues/5240 --- manifests/lens.pp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'manifests/lens.pp') diff --git a/manifests/lens.pp b/manifests/lens.pp index ac4fddf..b299dc6 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -30,6 +30,12 @@ define augeas::lens ( fail('You must declare the augeas class before using augeas::lens') } + File { + owner => 'root', + group => 'root', + mode => '0644', + } + if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { validate_re( -- cgit v1.2.3 From 681e60915d9f09360d28291b9259ecbff1c12dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 28 Oct 2014 12:22:32 +0100 Subject: Set default path for commands in augeas::lens --- manifests/lens.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'manifests/lens.pp') diff --git a/manifests/lens.pp b/manifests/lens.pp index b299dc6..b5b9acd 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -36,6 +36,10 @@ define augeas::lens ( mode => '0644', } + Exec { + path => $::path, + } + if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { validate_re( -- cgit v1.2.3