git://repos.xcallymotion.com
/
motion.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
Built motion from commit a0baffd.|1.0.1
[motion.git]
/
scripts
/
post-merge.sh
diff --git
a/scripts/post-merge.sh
b/scripts/post-merge.sh
index
6e1a6f9
..
26dacc5
100644
(file)
--- a/
scripts/post-merge.sh
+++ b/
scripts/post-merge.sh
@@
-12,6
+12,6
@@
echo "tigerdial-update"
tigerdial-update
echo "tigerdial restart"
service tigerd restart
-echo "pm2 restart"
-pm2 restart motion
+echo "pm2 reload"
+pm2 reload /var/opt/motion/server/app.json
echo "post-merge finished"