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

diff --git a/modules/varnish/manifests/init.pp b/modules/varnish/manifests/init.pp
index b134c8edd..4d10c6619 100644
--- a/modules/varnish/manifests/init.pp
+++ b/modules/varnish/manifests/init.pp
@@ -1,27 +1,40 @@
 class varnish {
 
         package { 'varnish':
-                ensure => installed
+                ensure => installed,
         }
 
         service { '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  => Service['varnish'],
+		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  => Service['varnish'],
+		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',
         }
 }