summaryrefslogtreecommitdiff
path: root/code/environments
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-17 14:12:01 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-17 14:12:01 +0100
commit41963c24fcf471f7825273f5b7fe18d95e35a4ca (patch)
tree06ac86948a481339674ef42e9c700e8f5fa15e79 /code/environments
parentda9da65d53a718c5c22afc265c0315887ea54605 (diff)
downloadpuppet.FWSECK-41963c24fcf471f7825273f5b7fe18d95e35a4ca.tar.gz
puppet.FWSECK-41963c24fcf471f7825273f5b7fe18d95e35a4ca.tar.bz2
puppet.FWSECK-41963c24fcf471f7825273f5b7fe18d95e35a4ca.zip
lsb-release-with-version: Fix quoting, remove cruft.
Diffstat (limited to 'code/environments')
-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 4472c2f..cc25017 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',
}
}