summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-17 13:56:00 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-17 13:56:00 +0100
commit018fbc43ce1d988c5d51baf7fb0a43bfbd571d6b (patch)
treea272a8964bd3b1a594e196709d6e6e64c34e0386
parent379ac7e1a67b20afc71a587229da2bd6ebf35c99 (diff)
downloadpuppet.KATH-018fbc43ce1d988c5d51baf7fb0a43bfbd571d6b.tar.gz
puppet.KATH-018fbc43ce1d988c5d51baf7fb0a43bfbd571d6b.tar.bz2
puppet.KATH-018fbc43ce1d988c5d51baf7fb0a43bfbd571d6b.zip
lsb-release-with-version: Remove some cruft.
-rw-r--r--code/environments/production/manifests/site.pp16
1 files changed, 13 insertions, 3 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 86b4cc6..8978d7e 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -58,9 +58,19 @@ 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',
}
}