From 84434cc747b50a6f1d0a9243efdb52155202c6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 18 Sep 2023 20:18:40 +0200 Subject: Fix lint errors. --- manifests/init.pp | 4 ++-- manifests/setup.pp | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index b807405..ccbdebb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,11 +7,11 @@ # @param order # Relative order to all other environment variables. define envvar ( - $value, + String $value, String $key = $name, Integer[1, 999] $order = 100, ) { - include ::envvar::setup + include envvar::setup concat::fragment { "/etc/environment - ${name}": target => '/etc/environment', diff --git a/manifests/setup.pp b/manifests/setup.pp index acaba6d..1584680 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -7,13 +7,15 @@ class envvar::setup { order => 'numeric', } - concat::fragment { '/etc/environment -- header': - target => '/etc/environment', - order => 0, - content => @(EOF) + $header = @(EOF) # File managed by Puppet # Local changes will get overwritten. | EOF + + concat::fragment { '/etc/environment -- header': + target => '/etc/environment', + order => 0, + content => $header, } lookup('environment', undef, 'hash', {}).map |$key, $value| { @@ -21,5 +23,4 @@ class envvar::setup { value => $value, } } - } -- cgit v1.2.3