From 265fdefba10a85e85775032ed25864250b945d51 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Mon, 6 Feb 2012 16:32:34 +0000
Subject: [PATCH] Cleanup puppet modules

Make files notify services to restart when changed
Improve planet's cron, spit out a date/time and append instead of overwrite log

Change-Id: I0c2ee96c4aff5512a891c49b8b2df5c20c9cab44
---
 manifests/init.pp | 2 +-
 manifests/site.pp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index f5a69b4..c4bf6d2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,7 +20,7 @@ class planet {
     ensure => directory
   }
 
-  service { 'nginx':
+  service { "nginx":
     ensure => running,
     hasrestart => true
   }
diff --git a/manifests/site.pp b/manifests/site.pp
index 92ae035..98da016 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -4,7 +4,8 @@ define planet::site($git_url) {
     ensure => present,
     content => template("planet/nginx.erb"),
     replace => true,
-    require => Package[nginx]
+    require => Package[nginx],
+    notify => Service[nginx]
   }
 
   file { "/etc/nginx/sites-enabled/planet-${name}":
@@ -33,7 +34,7 @@ define planet::site($git_url) {
   cron { "update_planet_${name}":
     user => root,
     minute => "*/5",
-    command => "cd /var/lib/planet/${name} && planet /var/lib/planet/${name}/planet.ini > /var/log/planet/${name}.log 2>&1"
+    command => "date >> /var/log/planet/${name}.log && cd /var/lib/planet/${name} && planet /var/lib/planet/${name}/planet.ini >> /var/log/planet/${name}.log 2>&1"
   }
 
 }