From 41963c24fcf471f7825273f5b7fe18d95e35a4ca Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 17 Dec 2018 14:12:01 +0100 Subject: lsb-release-with-version: Fix quoting, remove cruft. --- code/environments/production/manifests/site.pp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'code') 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', } } -- cgit v1.2.3