allow archvsync to trigger snapshot imports

[mirror/dsa-puppet.git] / modules / varnish / manifests / init.pp

diff --git a/modules/varnish/manifests/init.pp b/modules/varnish/manifests/init.pp
index 036530a..7561869 100644 (file)
--- a/modules/varnish/manifests/init.pp
+++ b/modules/varnish/manifests/init.pp
@@ -8,20 +8,39 @@ 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 { '/var/lib/varnish/.nobackup':
+               ensure  => present,
+               content => "",
+               require =>  Package['varnish'],
+               mode    => '0444',
+       }
+
+        file { '/etc/logrotate.d/varnish':
+               source => 'puppet:///modules/varnish/varnish.logrotate',
+               require =>  Package['varnish'],
+               mode    => '0444',
         }
 }