From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 28 Nov 2013 03:24:02 +0000 (-0800)
Subject: add merged file
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6316722fca28b1f1215eeb96a6db0cf03ac277e5;p=discourse_docker.git

add merged file
---

diff --git a/templates/cron.template.yml b/templates/cron.template.yml
index 86d47a6..60140c7 100644
--- a/templates/cron.template.yml
+++ b/templates/cron.template.yml
@@ -6,7 +6,16 @@ run:
         #!/bin/bash
         exec 2>&1
         cd /
-        exec cron
+        exec cron -f
+  - file:
+     path: /etc/service/rsyslog/run
+     chmod: "+x"
+     contents: |
+        #!/bin/bash
+        exec 2>&1
+        cd /
+        exec rsyslogd -n
+
   - exec:
       hook: cron
       cmd: echo cron installed