projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of backports-master vhost on static
[mirror/dsa-puppet.git]
/
modules
/
varnish
/
manifests
/
init.pp
diff --git
a/modules/varnish/manifests/init.pp
b/modules/varnish/manifests/init.pp
index
f5202ce
..
004711e
100644
(file)
--- a/
modules/varnish/manifests/init.pp
+++ b/
modules/varnish/manifests/init.pp
@@
-8,20
+8,27
@@
class varnish {
ensure => running,
}
ensure => running,
}
+ include apache2::dynamic
+
@ferm::rule { 'dsa-varnish':
domain => '(ip ip6)',
@ferm::rule { 'dsa-varnish':
domain => '(ip ip6)',
+ prio => '100',
description => 'Allow http access',
description => 'Allow http access',
-
rule => '&TCP_SERVICE(
80)'
+
rule => '&SERVICE(tcp,
80)'
}
file { '/etc/default/varnish':
}
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':
}
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',
}
}
}
}