From 6c58aa60d68ade693956dfc92361539136c5369f Mon Sep 17 00:00:00 2001
From: dragondaddy <dragondaddy@caselibre.fr>
Date: Tue, 24 Oct 2023 21:28:46 +0200
Subject: [PATCH] We should be good now

---
 conf/cronjobs        | 2 +-
 conf/daily-update.sh | 2 +-
 scripts/install      | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/conf/cronjobs b/conf/cronjobs
index 43f335d..79d98e2 100644
--- a/conf/cronjobs
+++ b/conf/cronjobs
@@ -1,4 +1,4 @@
 # Run poller periodically to update your website
 */10 * * * * __APP__ /usr/bin/php__PHPVERSION__ -f Code/Daemon/Run.php Cron > /dev/null 2>&1
 # Daily software update job
-30 05 * * * __APP__ /bin/bash __DATA_DIR__/daily-update.sh >> __DATA_DIR__/daily-updates.log 2>&1
+30 05 * * * root /bin/bash __DATA_DIR__/daily-update.sh >> __DATA_DIR__/daily-updates.log 2>&1
diff --git a/conf/daily-update.sh b/conf/daily-update.sh
index a0a1aa2..d3953cd 100644
--- a/conf/daily-update.sh
+++ b/conf/daily-update.sh
@@ -4,6 +4,6 @@ echo " "
 echo "+++ $(date) +++"
 echo " "
 echo "$(date) - Updating website..."
-(cd /var/www/__APP__ ; util/udall)
+(cd /var/www/__APP__ ; sudo -u __APP__ util/udall)
 echo "$(date) - Daily update finished."
 
diff --git a/scripts/install b/scripts/install
index 2dca129..ce9c096 100755
--- a/scripts/install
+++ b/scripts/install
@@ -52,6 +52,7 @@ git config --system --add safe.directory $install_dir
 
 # Download, check integrity, uncompress and patch the source from GitHub
 git clone https://codeberg.org/streams/streams.git "$install_dir" --quiet
+git config pull.rebase false
 
 touch "$install_dir/php.log"
 mkdir -p "$install_dir/store"
@@ -81,6 +82,8 @@ chown -R $app:www-data "$install_dir"
 
 pushd $install_dir
     ynh_exec_as $app util/add_addon_repo https://codeberg.org/streams/streams-addons.git zaddons
+    cd var/www/$app/extend/addon/zaddons
+    ynh_exec_as $app git config pull.rebase false
 popd
 
 #=================================================