X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvarnish%2Fmanifests%2Finit.pp;h=004711ed1b86a9ea1ec6be36a50599ff96f6df14;hb=d7e050f56b61ddc883f8328f17933d1d1f94dc9a;hp=f5202cee77fe6c7b19c27a4614c80a366ce83031;hpb=413f3f84b3b864e6eb48996d7ecbc7ae941e388b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/varnish/manifests/init.pp b/modules/varnish/manifests/init.pp
index f5202cee7..004711ed1 100644
--- a/modules/varnish/manifests/init.pp
+++ b/modules/varnish/manifests/init.pp
@@ -8,20 +8,27 @@ class varnish {
                 ensure => running,
         }
 
+	include apache2::dynamic
+
         @ferm::rule { 'dsa-varnish':
                 domain      => '(ip ip6)',
+		prio        => '100',
                 description => 'Allow http access',
-                rule        => '&TCP_SERVICE(80)'
+		rule        => '&SERVICE(tcp, 80)'
         }
 
         file { '/etc/default/varnish':
-		source => 'puppet:///modules/varnish/files/varnish.default'
-                notify  => Exec['varnish restart'],
+		source  => 'puppet:///modules/varnish/varnish.default',
+		require =>  Package['varnish'],
+                notify  =>  Service['varnish'],
+		mode    => '0444',
         }
 
         file { '/etc/varnish/default.vcl':
-		source => 'puppet:///modules/varnish/files/default.vcl'
-                notify  => Exec['varnish restart'],
+		source => 'puppet:///modules/varnish/default.vcl',
+		require =>  Package['varnish'],
+		notify =>  Service['varnish'],
+		mode    => '0444',
         }
 }