From 3fb803257d5a3d10a761b6b28b36dd7e81e85105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sun, 2 Oct 2022 19:41:49 +0200
Subject: Start using envvar module.

---
 manifests/cowsay.pp      |  6 ++----
 manifests/environment.pp | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 manifests/environment.pp

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 }),
-  }
-
-}
-- 
cgit v1.2.3