From 14310ff263e7fb81ae4a615c674be830298c3d24 Mon Sep 17 00:00:00 2001
From: David Czarnecki <dczarnecki@agoragames.com>
Date: Wed, 25 Sep 2013 16:53:32 -0400
Subject: [PATCH] Fix a filename and pillar key issue

* Ensure `common.sls` references correct template filename
* Use `pillar.get(...)` for message_do_not_modify with default
---
 nginx/common.sls               | 2 +-
 templates/upstart-logger.jinja | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx/common.sls b/nginx/common.sls
index a096c48..61c8cbd 100644
--- a/nginx/common.sls
+++ b/nginx/common.sls
@@ -24,7 +24,7 @@ nginx-logger-{{ log_type }}:
     - user: root
     - group: root
     - mode: 440
-    - source: salt://nginx/templates/upstart_logger.jinja
+    - source: salt://nginx/templates/upstart-logger.jinja
     - context:
       type: {{ log_type }}
   service:
diff --git a/templates/upstart-logger.jinja b/templates/upstart-logger.jinja
index e5356ad..24d08be 100644
--- a/templates/upstart-logger.jinja
+++ b/templates/upstart-logger.jinja
@@ -1,4 +1,4 @@
-# {{ pillar['message_do_not_modify'] }}
+# {{ pillar.get('message_do_not_modify', '') }}
 # startup script for Nginx loggers
 
 start on starting nginx