X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fplanet_master.pp;h=07d85e08442de7e7725f931b4806a192b112bdac;hb=4fd87c46d590f873f1953302a9ac069714fcafc1;hp=3d47163e140b0af2159a6e3e09bc713644153d75;hpb=c93738739075e2bd2ebac4c3d4ac1be171634003;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/planet_master.pp b/modules/roles/manifests/planet_master.pp index 3d47163e1..07d85e084 100644 --- a/modules/roles/manifests/planet_master.pp +++ b/modules/roles/manifests/planet_master.pp @@ -1,13 +1,14 @@ class roles::planet_master { - include apache2::ssl - apache2::config { 'puppet-debianhosts': - ensure => 'absent', - } - apache2::site { 'planet-master.debian.org': - template => template('roles/planet_master/planet-master.debian.org.erb') - } - ssl::service { 'planet-master.debian.org': - notify => Exec['service apache2 reload'], - key => true, - } + include apache2 + include apache2::ssl + apache2::config { 'puppet-debianhosts': + ensure => 'absent', + } + apache2::site { 'planet-master.debian.org': + content => template('roles/planet_master/planet-master.debian.org.erb') + } + ssl::service { 'planet-master.debian.org': + notify => Exec['service apache2 reload'], + key => true, + } }