projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d35901d
)
Make the apt_restricted acl an apache macro
author
Julien Cristau
<jcristau@debian.org>
Tue, 8 Oct 2019 15:09:22 +0000
(17:09 +0200)
committer
Julien Cristau
<jcristau@debian.org>
Tue, 8 Oct 2019 15:09:22 +0000
(17:09 +0200)
modules/roles/manifests/dbmaster.pp
patch
|
blob
|
history
diff --git
a/modules/roles/manifests/dbmaster.pp
b/modules/roles/manifests/dbmaster.pp
index
f207b21
..
6db028f
100644
(file)
--- 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' |>>
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
+ }
}
}