From 5f5731868f740929aa4a18be0a66856a5ffc3116 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Mon, 4 Jun 2012 10:39:23 -0400
Subject: [PATCH] rearrange a ton of things

---
 .../debian-base/manifests/init.pp             |  7 ++++++-
 .../varnish/manifests/debian.pp               | 10 +++++-----
 .../varnish/manifests/init.pp                 |  2 +-
 .../varnish/manifests/redhat.pp               | 17 +++++++++++++++++
 .../varnish/templates/redhat/init-d-prerun    |  0
 .../varnish/templates/redhat/init-d-prolog    | 19 +++++++++++++++++++
 .../varnish/templates/varnish-init.d          |  3 +++
 7 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 shared/additional-modules/varnish/manifests/redhat.pp
 create mode 100644 shared/additional-modules/varnish/templates/redhat/init-d-prerun
 create mode 100644 shared/additional-modules/varnish/templates/redhat/init-d-prolog

diff --git a/shared/additional-modules/debian-base/manifests/init.pp b/shared/additional-modules/debian-base/manifests/init.pp
index 7b7b742..8bf68a4 100644
--- a/shared/additional-modules/debian-base/manifests/init.pp
+++ b/shared/additional-modules/debian-base/manifests/init.pp
@@ -1,5 +1,10 @@
 class basics {
-  $packages = [ "ntp", "ntpdate", "gcc", "curl", "build-essential", "patch", 'sysstat', 'git-core', 'vim' ]
+  $packages = [
+    "ntp", "ntpdate", "gcc", "curl",
+    "build-essential", "patch", 'sysstat',
+    'git-core', 'vim'
+  ]
+
   package { $packages: ensure => installed }
 
   bash_rc { "/etc/bash.bashrc": ensure => present }
diff --git a/shared/additional-modules/varnish/manifests/debian.pp b/shared/additional-modules/varnish/manifests/debian.pp
index d2f9b85..c1f1633 100644
--- a/shared/additional-modules/varnish/manifests/debian.pp
+++ b/shared/additional-modules/varnish/manifests/debian.pp
@@ -1,6 +1,6 @@
-class varnish::debian($version, $vcl_template, $store_file_mb = 1024) {
-  $varnish_user = 'varnish'
-  $varnish_group = 'varnish'
+class varnish::debian($version, $vcl, $store_file_mb = 1024) {
+  $user = 'varnish'
+  $group = 'varnish'
 
   user { $varnish_user: uid => 27835 }
 
@@ -11,7 +11,7 @@ class varnish::debian($version, $vcl_template, $store_file_mb = 1024) {
   class { 'varnish':
     version => $version,
     require => Package[$packages],
-    vcl_template => $vcl_template
+    vcl_template => $vcl
   }
 
   init_d { 'varnish':
@@ -21,7 +21,7 @@ class varnish::debian($version, $vcl_template, $store_file_mb = 1024) {
   }
 
   exec { 'ensure-data-store-ownership':
-    command => "chown -R ${varnish_user}:${varnish_group} ${varnish::data}",
+    command => "chown -R ${user}:${group} ${varnish::data}",
     path => $base::path,
     require => Class['varnish']
   }
diff --git a/shared/additional-modules/varnish/manifests/init.pp b/shared/additional-modules/varnish/manifests/init.pp
index dc6dc56..95d9c70 100644
--- a/shared/additional-modules/varnish/manifests/init.pp
+++ b/shared/additional-modules/varnish/manifests/init.pp
@@ -42,7 +42,7 @@ class varnish($version, $vcl_template, $store_file_mb = 1024) {
   $varnish_stop = "service varnish stop"
 
   file { $vcl_path:
-    content => template($vcl_template),
+    content => $vcl_template,
     require => Build_and_install[$name]
   }
 
diff --git a/shared/additional-modules/varnish/manifests/redhat.pp b/shared/additional-modules/varnish/manifests/redhat.pp
new file mode 100644
index 0000000..be9f023
--- /dev/null
+++ b/shared/additional-modules/varnish/manifests/redhat.pp
@@ -0,0 +1,17 @@
+class varnish::redhat($version, $user, $group, $vcl) {
+  $init_d_prolog = template('varnish/redhat/init-d-prolog')
+  $init_d_prerun = template('varnish/redhat/init-d-prerun')
+
+  class { varnish:
+    vcl_template => $vcl,
+    version => $version
+  }
+
+  $varnish_init_d = "${varnish::share}/varnish-init.d"
+  file { $varnish_init_d:
+    content => template('varnish/varnish-init.d'),
+    require => Mkdir_p[$varnish::share],
+    mode => 755
+  }
+}
+
diff --git a/shared/additional-modules/varnish/templates/redhat/init-d-prerun b/shared/additional-modules/varnish/templates/redhat/init-d-prerun
new file mode 100644
index 0000000..e69de29
diff --git a/shared/additional-modules/varnish/templates/redhat/init-d-prolog b/shared/additional-modules/varnish/templates/redhat/init-d-prolog
new file mode 100644
index 0000000..a0386c7
--- /dev/null
+++ b/shared/additional-modules/varnish/templates/redhat/init-d-prolog
@@ -0,0 +1,19 @@
+#
+# varnish Control the Varnish Cache
+#
+# chkconfig: - 90 10
+# description: Varnish is a high-perfomance HTTP accelerator
+# processname: varnishd
+# config: /etc/sysconfig/varnish
+# pidfile: /var/run/varnishd.pid
+
+### BEGIN INIT INFO
+# Provides: varnish
+# Required-Start: $network $local_fs $remote_fs
+# Required-Stop: $network $local_fs $remote_fs
+# Default-Start:
+# Default-Stop:
+# Should-Start: $syslog
+# Short-Description: start and stop varnishd
+# Description: Varnish is a high-perfomance HTTP accelerator
+### END INIT INFO
diff --git a/shared/additional-modules/varnish/templates/varnish-init.d b/shared/additional-modules/varnish/templates/varnish-init.d
index 0c32ef8..6a7e864 100644
--- a/shared/additional-modules/varnish/templates/varnish-init.d
+++ b/shared/additional-modules/varnish/templates/varnish-init.d
@@ -3,6 +3,9 @@
 <%= init_d_prolog %>
 <%= init_d_prerun %>
 
+USER=<%= user %>
+GROUP=<%= group %>
+
 start() {
   echo -n "Starting $NAME: "