diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-23 20:24:47 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-02-09 18:05:08 +0100 |
| commit | a632485fab4ec0d01326dcb820545d615fa9f621 (patch) | |
| tree | 2067dc9bbc99057689012e4aadc577a95d107d4a | |
| parent | Require mountpoint. (diff) | |
| download | profiles-a632485fab4ec0d01326dcb820545d615fa9f621.tar.gz profiles-a632485fab4ec0d01326dcb820545d615fa9f621.tar.xz | |
Change linux environment configuration.
| -rw-r--r-- | manifests/workstation.pp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/manifests/workstation.pp b/manifests/workstation.pp index 950e420..051f3fc 100644 --- a/manifests/workstation.pp +++ b/manifests/workstation.pp @@ -101,15 +101,16 @@ class profiles::workstation ( '/usr/local/share/cows', ] + # Merge everything from hiera, but provide defeaults for + # non-overwritten values. + $default_environment = { + 'COWPATH' => $cowpath.join(':'), + } + $user_environment = lookup('environment', undef, 'hash', {}) + $environment = $default_environment + $user_environment + file { '/etc/environment': - content => epp('profiles/keyvalue.epp', { values => { - 'COWPATH' => $cowpath.join(':'), - 'MANWIDTH' => 80, - 'MPD_HOST' => 'jukebox.lysator.liu.se', - 'PAGER' => 'less', - 'EDITOR' => '/usr/bin/vi', - 'VISUAL' => '/usr/bin/vim', - }}) + content => epp('profiles/keyvalue.epp', { values => $environment }), } file { 'Passmenu with OTP support': |