X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdbmaster.pp;h=2b9bf7f19d2bf9078603fac676af321206be31ec;hb=a84443e11b7d28b6a2958c4bea306f1342b0fa54;hp=6db028f4de0a59b6368af1226006c51ef6d9fc9b;hpb=82560e1ed1ce21ca875ac4a6b48bedaf5c7dfc8b;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp index 6db028f4d..2b9bf7f19 100644 --- a/modules/roles/manifests/dbmaster.pp +++ b/modules/roles/manifests/dbmaster.pp @@ -68,17 +68,22 @@ class roles::dbmaster { } 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', + target => '/etc/apache2/conf-available/puppet-restricted-acl.conf', + order => '01', content => @(EOF) | EOF } concat::fragment { 'debian_org::apt_restricted::apache-acl-tail': - target => '/etc/apache2/conf-available/puppet-restricted-acl.conf', - order => '99', + target => '/etc/apache2/conf-available/puppet-restricted-acl.conf', + order => '99', content => @(EOF) | EOF } + file { '/etc/apache2/conf-enabled/puppet-restricted-acl.conf': + ensure => symlink, + target => '../conf-available/puppet-restricted-acl.conf', + notify => Exec['service apache2 reload'], + } }