From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 25 Jan 2013 23:12:23 +0000 (+0100)
Subject: not my day II
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7e4f6aa823f850e0deb757b813227bc5b81b88c9;p=mirror%2Fdsa-puppet.git

not my day II
---

diff --git a/modules/varnish/files/default.vcl b/modules/varnish/files/default.vcl
index cb946cfbc..66ff13aa1 100644
--- 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 16eb39286..4f4244f5f 100644
--- 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 7ce53d289..d7da796d4 100644
--- 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',
         }
 }