summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-17 13:54:05 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-17 13:54:05 +0100
commit6fd6e22b3661070a9d399bd73480d98421b286dd (patch)
tree721cae8e78f5a528d89ac51e3ce07949ed0e94e4
parentadfa9c4346763b922b07d3ec9330ab89eed294d7 (diff)
downloadpuppet.WDORF-6fd6e22b3661070a9d399bd73480d98421b286dd.zip
puppet.WDORF-6fd6e22b3661070a9d399bd73480d98421b286dd.tar.gz
puppet.WDORF-6fd6e22b3661070a9d399bd73480d98421b286dd.tar.bz2
lsb-release-with-version: Remove some cruft.HEADmaster
-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 5117f1a..019a70b 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -50,9 +50,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',
}
}