From: Stephen Gran Date: Sun, 15 Nov 2009 02:18:56 +0000 (+0000) Subject: now a template X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4b4dd07daf04794f2bb0af0491ae139a1d5e87c8;p=mirror%2Fdsa-puppet.git now a template Signed-off-by: Stephen Gran --- diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index 526ec8887..2adc16ad2 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -80,8 +80,7 @@ class apache2 { notify => Exec["reload-apache2"]; "/etc/apache2/sites-available/default-debian.org": - source => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/default-debian.org", - "puppet:///apache2/common/etc/apache2/sites-available/default-debian.org" ], + content => template("apache2/default-debian.org.erb", require => Package["apache2"], notify => Exec["reload-apache2"];