diff --git a/deployment/post-receive b/deployment/githook.sh similarity index 97% rename from deployment/post-receive rename to deployment/githook.sh index a084d420..6183eccf 100755 --- a/deployment/post-receive +++ b/deployment/githook.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This hook builds pixelplanet after a push, and deploys it +# This hook builds pixelplanet after a push, and deploys it, it should be ron post-receive # If it is the production branch, it will deploy it on the life system, and other branch will get deployed to the dev-canvas (a second canvas that is running on the server) # # To set up a server to use this, you have to go through the building steps manually first. @@ -64,6 +64,7 @@ do pm2 start ecosystem-backup.yml pm2 start ecosystem-captchas.yml else + branch="dev" echo "---UPDATING REPO ON DEV SERVER---" pm2 stop ppfun-server-dev pm2 stop ppfun-captchas-dev