From 8b90248ce81594227d74d9c16bcd3cce3a7b2fa7 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Fri, 11 Mar 2022 20:15:27 +0100
Subject: [PATCH] made apparmor lighttpd profile suitable for both OS 18.04 and
 20.04

---
 global/overlay/etc/puppet/manifests/cosmos-site.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index d8cd0af2..c5b7a6c2 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -249,7 +249,12 @@ class md_publisher(Array $allow_clients=['any'], $keyname=undef, String $dir="/v
       ensure => 'link',
       target => "/etc/ssl/private/${_keyname}.pem"
    } ->
-   apparmor::profile { 'usr.sbin.lighttpd': source => '/etc/apparmor-cosmos/usr.sbin.lighttpd' } ->
+   if ($::operatingsystemrelease < '20.04') {
+     apparmor::profile { 'usr.sbin.lighttpd': source => '/etc/apparmor-cosmos/usr.sbin.lighttpd' }
+     }
+   else {
+     apparmor::profile { 'usr.sbin.lighttpd': source => '/etc/apparmor-cosmos/usr.sbin.lighttpd.upgraded' }
+     }
    file {'/etc/lighttpd/conf-enabled/99-mime-xattr.conf':
       ensure  => file,
       mode    => '0640',