X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvarnish%2Fmanifests%2Finit.pp;h=4d10c66192433908875bed9a7a894a4cc1576d6b;hb=b31ea650c9caecaf1fd2c5af6a47a0d340e22c5f;hp=036530ab7d3f13841f503e6cb59c7064f9f3524a;hpb=82a74e7aaec6920d64bbbe3495e800e4ac0463d9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/varnish/manifests/init.pp b/modules/varnish/manifests/init.pp
index 036530ab7..4d10c6619 100644
--- a/modules/varnish/manifests/init.pp
+++ b/modules/varnish/manifests/init.pp
@@ -8,20 +8,33 @@ 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',
+        }
+
+        file { '/etc/logrotate.d/varnish':
+		source => 'puppet:///modules/varnish/varnish.logrotate',
+		require =>  Package['varnish'],
+		mode    => '0444',
         }
 }