From e9f4ea86f551fd44cc6ada0c7d80d9a40063c205 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Tue, 18 May 2021 15:29:06 +0200
Subject: [PATCH] webhook deploy fix

---
 assets/webhook-deploy.sh |  4 ++--
 bin/webhook.sh           | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/assets/webhook-deploy.sh b/assets/webhook-deploy.sh
index 1d79802..7a42b21 100644
--- a/assets/webhook-deploy.sh
+++ b/assets/webhook-deploy.sh
@@ -1,7 +1,7 @@
-#!/bin/bach
+#!/bin/bash
 
 # update bare repos
 git --git-dir=git-repositories/DOMAIN.git fetch origin prod:prod
 # deploy prod
-cd www/DOMAIN/app
+cd www/DOMAIN/
 ./deploy.sh
diff --git a/bin/webhook.sh b/bin/webhook.sh
index 06ff463..126f823 100755
--- a/bin/webhook.sh
+++ b/bin/webhook.sh
@@ -90,20 +90,21 @@ apt-get install webhook
 git --git-dir=/home/"$user"/git-repositories/"$_domain.git" remote add origin "$_remote"
 
 # hook deploy script
-cp -f "$_assets"/webhook-deploy.sh /home/"$user"/webhook-deploy-"$_id".sh
-sed -i -r "s/DOMAIN/$_id/g" /home/"$user"/webhook-deploy-"$_id".sh
-chmod +x /home/"$user"/webhook-deploy-"$_id".sh
+cp -f "$_assets"/webhook-deploy.sh /home/"$user"/webhook_deploy_"$_id".sh
+sed -i -r "s/DOMAIN/$_domain/g" /home/"$user"/webhook_deploy_"$_domain".sh
+chowm $user:$user /home/"$user"/webhook_deploy_"$_id".sh
+chmod +x /home/"$user"/webhook_deploy_"$_id".sh
 
 # remove git bare repos hook
 mv /home/"$user"/git-repositories/"$_domain".git/hooks/post-receive /home/"$user"/git-repositories/"$_domain".git/hooks/post-receive.back
 
 # webhook conf
-touch /etc/webhook.conf
+touch /etc/webhooks.conf
 echo "
 - id: deploy_app_$_id
   execute-command: /home/$user/webhook-deploy-$_id.sh
   command-working-directory: /home/$user/
-" >> /etc/webhook.conf
+" >> /etc/webhooks.conf
 
 # webhook service
 cp -f "$_assets"/webhook.service /etc/systemd/system/webhook.service