include better firewall rules

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

diff --git a/modules/varnish/manifests/init.pp b/modules/varnish/manifests/init.pp
index b134c8edd7e3fc565ca551514ae005ce9a8fb051..ca204a718c4ec353d82b0b71cf947c1c52d0588d 100644 (file)
--- a/modules/varnish/manifests/init.pp
+++ b/modules/varnish/manifests/init.pp
@@ -1,27 +1,33 @@
 class varnish {
 
         package { 'varnish':
-                ensure => installed
+                ensure => installed,
         }
 
         service { 'varnish':
                 ensure => running,
         }
 
+       include apache2::dynamic
+
         @ferm::rule { 'dsa-varnish':
                 domain      => '(ip ip6)',
                 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',
         }
 }