From 089518ef2f22296f066166189faabf3c3119c354 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Thu, 31 Jul 2014 00:40:39 -0400
Subject: [PATCH] Handle copy_env in runit stage 1 and simplify

---
 templates/web.template.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/templates/web.template.yml b/templates/web.template.yml
index 5fad8d1..6b0184e 100644
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -22,7 +22,7 @@ params:
 
 run:
   - file:
-     path: /etc/service/copy_env/run
+     path: /etc/runit/1.d/copy-env
      chmod: "+x"
      contents: |
         #!/bin/bash
@@ -32,9 +32,6 @@ run:
         # find DISCOURSE_ env vars, strip the leader, lowercase the key
         env | /usr/bin/awk -F= -vOFS== '$1 ~ /^DISCOURSE_/ {print substr(tolower($1),11),$2}' > $conf
 
-        # tell runsv to not restart this when it exits
-        sv once copy_env
-
   - file:
      path: /etc/service/unicorn/run
      chmod: "+x"
@@ -43,7 +40,6 @@ run:
         exec 2>&1
         # redis
         # postgres
-        sv check copy_env || exit 1
         cd $home
         chown -R discourse:www-data /shared/log/rails
         exec sudo -E -u discourse LD_PRELOAD=/usr/lib/libjemalloc.so.1 bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb
-- 
2.25.1