From 239df6f79bbb16fb51688e51ee254dcb329006aa Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Wed, 16 May 2012 20:33:23 -0400
Subject: [PATCH] varrrnish

---
 .../varnish-vcl/manifests/init.pp                 | 15 ---------------
 .../varnish/templates/varnish-init.d              |  3 +++
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 shared/additional-modules/varnish-vcl/manifests/init.pp

diff --git a/shared/additional-modules/varnish-vcl/manifests/init.pp b/shared/additional-modules/varnish-vcl/manifests/init.pp
deleted file mode 100644
index 125e026..0000000
--- a/shared/additional-modules/varnish-vcl/manifests/init.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-class varnish-default-vcl {
-  $backend_port = '8080'
-  $assets_age = 86400
-  $no_ttl_time = "10m"
-
-  $healthy_grace_time = "1m"
-  $sick_grace_time = "24h"
-  $probe_interval = "3s"
-
-  file { $varnish::vcl_path:
-    content => template('varnish-default-vcl/default.vcl'),
-    require => [ Build_and_install[$name], Mkdir_p[$config_path] ],
-  }
-}
-
diff --git a/shared/additional-modules/varnish/templates/varnish-init.d b/shared/additional-modules/varnish/templates/varnish-init.d
index 217847b..e7a209a 100644
--- a/shared/additional-modules/varnish/templates/varnish-init.d
+++ b/shared/additional-modules/varnish/templates/varnish-init.d
@@ -34,6 +34,9 @@ stop() {
     fi
   done
 
+  killall -9 varnishd
+  killall -9 varnishncsa
+
   echo "done"
 }