From: Dan Hunsaker <danhunsaker@gmail.com>
Date: Sun, 22 Dec 2019 07:55:27 +0000 (-0700)
Subject: Correct the Nanobox deploy hooks for order and context (#12663)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6821b34e0231856a42739250453d57cbb4132831;p=mastodon.git

Correct the Nanobox deploy hooks for order and context (#12663)

One hook was actually duplicated incorrectly; this has been fixed. Another hook was re-ordered for better results in actual use.
---

diff --git a/boxfile.yml b/boxfile.yml
index 1bc3929c8..c4fd19ce6 100644
--- a/boxfile.yml
+++ b/boxfile.yml
@@ -60,16 +60,15 @@ deploy.config:
     - touch /app/log/production.log
   before_live:
     web.web:
+      - bin/tootctl cache clear
       - bundle exec rake db:migrate:setup
+  after_live:
+    worker.sidekiq:
       - |-
           if [[ "${ES_ENABLED}" != "false" ]]
           then
             bin/tootctl search deploy
           fi
-      - bin/tootctl cache clear
-  after_live:
-    worker.sidekiq:
-      - bin/tootctl search deploy
 
 
 web.web: