From 82560e1ed1ce21ca875ac4a6b48bedaf5c7dfc8b Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Tue, 8 Oct 2019 17:09:22 +0200
Subject: [PATCH] Make the apt_restricted acl an apache macro

---
 modules/roles/manifests/dbmaster.pp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index f207b21ba..6db028f4d 100644
--- a/modules/roles/manifests/dbmaster.pp
+++ b/modules/roles/manifests/dbmaster.pp
@@ -67,4 +67,18 @@ class roles::dbmaster {
     warn           => '# This file is maintained with puppet',
   }
   Concat::Fragment <<| tag == 'debian_org::apt_restricted::apache-acl' |>>
+  concat::fragment { 'debian_org::apt_restricted::apache-acl-head':
+    target => '/etc/apache2/conf-available/puppet-restricted-acl.conf',
+    order => '01',
+    content => @(EOF)
+      <Macro dsa-apt-restricted-acl>
+      | EOF
+  }
+  concat::fragment { 'debian_org::apt_restricted::apache-acl-tail':
+    target => '/etc/apache2/conf-available/puppet-restricted-acl.conf',
+    order => '99',
+    content => @(EOF)
+      </Macro>
+      | EOF
+  }
 }
-- 
2.20.1