summaryrefslogtreecommitdiff
path: root/code/environments/production/manifests/site.pp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-17 14:10:27 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-17 14:10:27 +0100
commita05401ae8c3f8aa960e651d39fa6443a2acd850f (patch)
treec51a96986624ed921c4eb5dbcbbae31a72623226 /code/environments/production/manifests/site.pp
parent427e72e0d5c36472e814244288f0f223ba9285c3 (diff)
downloadpuppet.DEV-a05401ae8c3f8aa960e651d39fa6443a2acd850f.tar.gz
puppet.DEV-a05401ae8c3f8aa960e651d39fa6443a2acd850f.tar.bz2
puppet.DEV-a05401ae8c3f8aa960e651d39fa6443a2acd850f.zip
lsb-release-with-version: Fix quoting, remove cruft.
Diffstat (limited to 'code/environments/production/manifests/site.pp')
-rw-r--r--code/environments/production/manifests/site.pp21
1 files changed, 18 insertions, 3 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 7a5f836..757ede2 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -58,9 +58,24 @@ class lsb_release_with_version {
ensure => present,
}
file_line { 'lsb-release-with-version':
- path => '/etc/lsb-release',
- line => "DISTRIB_DESCRIPTION=Debian Edu / Skolelinux ${::operatingsystemrelease}",
- match => "^DISTRIB_DESCRIPTION=DebianEdu/Skolelinux$",
+ path => '/etc/lsb-release',
+ line => "DISTRIB_DESCRIPTION=\"Debian Edu / Skolelinux ${::operatingsystemrelease}\"",
+ match => "^DISTRIB_DESCRIPTION=\"DebianEdu/Skolelinux\"$",
+ }
+ file_line{ 'lsb-release-remove-cruft-1':
+ path => '/etc/lsb-release',
+ ensure => absent,
+ line => 'DISTRIB_DESCRIPTION="DebianEdu/Skolelinux"',
+ }
+ file_line{ 'lsb-release-remove-cruft-2':
+ path => '/etc/lsb-release',
+ ensure => absent,
+ line => 'DISTRIB_DESCRIPTION=Debian Edu / Skolelinux 8.11',
+ }
+ file_line{ 'lsb-release-remove-cruft-3':
+ path => '/etc/lsb-release',
+ ensure => absent,
+ line => 'DISTRIB_DESCRIPTION=Debian Edu / Skolelinux 9.6',
}
}