summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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',
}
}