From ad2bf9aff02b3a6bd3f7fa806bb3007623c7bb54 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 4 Mar 2021 22:59:28 +0100
Subject: [PATCH] Disable core-plugins

---
 check_process   | 4 ++++
 manifest.json   | 4 ++--
 scripts/install | 6 ++----
 scripts/upgrade | 6 ++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/check_process b/check_process
index 6f5c02f..af36d43 100644
--- a/check_process
+++ b/check_process
@@ -23,6 +23,8 @@
 		upgrade=1	from_commit=81e4075468d035b12ad70936d016d45d0f124720
 		# 1.14.2
 		upgrade=1	from_commit=cadb10e497d938e0e684e43ac870a3807b4b60d9
+		# 1.14.3
+		upgrade=1	from_commit=fe0bd01ffa787713e2b36408abe1e44033aacb69
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
@@ -35,3 +37,5 @@ Notification=none
 		name=1.14.1
 	; commit=cadb10e497d938e0e684e43ac870a3807b4b60d9
 		name=1.14.2
+	; commit=fe0bd01ffa787713e2b36408abe1e44033aacb69
+		name=1.14.3
diff --git a/manifest.json b/manifest.json
index ccea0b6..afe0a64 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,12 +13,12 @@
         "name": "yalh76"
     },
     "requirements": {
-        "yunohost": ">= 4.1.3"
+        "yunohost": ">= 4.1.7.3"
     },
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.0-fpm",
+        "php7.3-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/install b/scripts/install
index 1b59500..00cd724 100644
--- a/scripts/install
+++ b/scripts/install
@@ -141,7 +141,7 @@ mkdir -p "$final_path/include/plugins/build/.config/composer"
 COMPOSER_HOME="$final_path/include/plugins/build/.config/composer"
 
 pushd "$final_path/include/plugins/build"
-	php${phpversion} make.php hydrate
+	#php${phpversion} make.php hydrate
 	php${phpversion} -dphar.readonly=0 make.php build auth-cas
 	php${phpversion} -dphar.readonly=0 make.php build auth-ldap
 	php${phpversion} -dphar.readonly=0 make.php build auth-oauth
@@ -211,9 +211,7 @@ chmod 0644 $config_file
 #=================================================
 ynh_script_progression --message="Setting the cron file..."
 
-cp ../conf/cron /etc/cron.d/$app
-
-ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="/etc/cron.d/$app"
+ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
diff --git a/scripts/upgrade b/scripts/upgrade
index f3d3462..c218dbb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -139,7 +139,7 @@ then
 	mkdir -p "$final_path/include/plugins/build/.config/composer"
 	COMPOSER_HOME="$final_path/include/plugins/build/.config/composer"
 	pushd "$final_path/include/plugins/build"
-		php${phpversion} make.php hydrate
+		#php${phpversion} make.php hydrate
 		php${phpversion} -dphar.readonly=0 make.php build auth-cas
 		php${phpversion} -dphar.readonly=0 make.php build auth-ldap
 		php${phpversion} -dphar.readonly=0 make.php build auth-oauth
@@ -188,9 +188,7 @@ fi
 #=================================================
 ynh_script_progression --message="Setting the cron file..."
 
-cp -f ../conf/cron /etc/cron.d/$app
-
-ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="/etc/cron.d/$app"
+ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM