diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-10-02 19:41:49 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-10-02 19:43:01 +0200 |
| commit | 3fb803257d5a3d10a761b6b28b36dd7e81e85105 (patch) | |
| tree | ae0083646c94cccfdc00cb1706f93c7bcae411d1 | |
| parent | Include imagemagick profile from workstation. (diff) | |
| download | profiles-3fb803257d5a3d10a761b6b28b36dd7e81e85105.tar.gz profiles-3fb803257d5a3d10a761b6b28b36dd7e81e85105.tar.xz | |
Start using envvar module.
| -rw-r--r-- | manifests/cowsay.pp | 6 | ||||
| -rw-r--r-- | manifests/environment.pp | 15 |
2 files changed, 2 insertions, 19 deletions
diff --git a/manifests/cowsay.pp b/manifests/cowsay.pp index 5f995c5..cce6055 100644 --- a/manifests/cowsay.pp +++ b/manifests/cowsay.pp @@ -6,9 +6,7 @@ class profiles::cowsay ( ) { ensure_packages(['cowsay']) - # TODO see profiles::environment - concat::fragment { 'Cowsay paths': - target => '/etc/environment', - content => epp('profiles/keyvalue.epp', { values => { 'COWPATH' => $cowpath.join(':') }}), + envvar { 'COWPATH': + value => $cowpath.join(':'), } } diff --git a/manifests/environment.pp b/manifests/environment.pp deleted file mode 100644 index 6759127..0000000 --- a/manifests/environment.pp +++ /dev/null @@ -1,15 +0,0 @@ -# Manage global environment variables. -# TODO this should be moved to its own module, and provide propper -# resource types. -class profiles::environment { - concat { '/etc/environment': - ensure => 'present', - } - - $user_environment = lookup('environment', undef, 'hash', {}) - concat::fragment { 'User environment': - target => '/etc/environment', - content => epp('profiles/keyvalue.epp', { values => $user_environment }), - } - -} |