not my day II

diff --git a/modules/varnish/files/default.vcl b/modules/varnish/files/default.vcl
index cb946cfbcd074e41ca47d93a195390f9a0e6d6c4..66ff13aa1f5f307c518fa2d2f7d85e77b5aa08e0 100644 (file)
--- a/modules/varnish/files/default.vcl
+++ b/modules/varnish/files/default.vcl
@@ -1,3 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 backend holter {
         # holter.debian.org
         .host = "194.177.211.202";

diff --git a/modules/varnish/files/varnish.default b/modules/varnish/files/varnish.default
index 16eb39286242a2469ea42fa8fd8cf0e314a326ab..4f4244f5fe1bb6ef278cbac7b3346e3c30b0b3b8 100644 (file)
--- a/modules/varnish/files/varnish.default
+++ b/modules/varnish/files/varnish.default
@@ -1,3 +1,9 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+
 # Configuration file for varnish
 #
 # /etc/init.d/varnish expects the variables $DAEMON_OPTS, $NFILES and $MEMLOCK

diff --git a/modules/varnish/manifests/init.pp b/modules/varnish/manifests/init.pp
index 7ce53d289cf8204f0854389fea89c7aab188a6bd..d7da796d4093613c7040b806ffb7a3362184429f 100644 (file)
--- a/modules/varnish/manifests/init.pp
+++ b/modules/varnish/manifests/init.pp
@@ -15,13 +15,17 @@ class varnish {
         }
 
         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',
         }
 }