From 5b7ea04e1912b196c82a508d257c17d3b33d15ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 1 Mar 2023 09:21:48 +0100
Subject: [PATCH] Fix

---
 conf/extra_php-fpm.conf |  2 +-
 manifest.json           | 64 -----------------------------------------
 manifest.toml           |  2 +-
 scripts/backup          | 20 -------------
 scripts/install         |  5 ----
 scripts/restore         |  1 -
 scripts/upgrade         |  1 -
 7 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 manifest.json

diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
index b562556..cf24756 100644
--- a/conf/extra_php-fpm.conf
+++ b/conf/extra_php-fpm.conf
@@ -2,4 +2,4 @@
 
 php_admin_value[upload_max_filesize] = 1G
 php_admin_value[post_max_size] = 1G
-php_admin_value[max_input_vars] = 5000
\ No newline at end of file
+php_value[max_input_vars] = 5000
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index 60b4663..0000000
--- a/manifest.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "name": "Moodle",
-    "id": "moodle",
-    "packaging_format": 1,
-    "description": {
-        "en": "Online learning platform",
-        "fr": "Plateforme d'apprentissage en ligne"
-    },
-    "version": "4.1.1~ynh1",
-    "url": "https://moodle.org/",
-    "upstream": {
-        "license": "GPL-3.0-or-later",
-        "website": "https://moodle.org/",
-        "demo": "https://sandbox.moodledemo.net/",
-        "admindoc": "https://docs.moodle.org/400/en/Main_page",
-        "code": "https://github.com/moodle/moodle"
-    },
-    "license": "GPL-3.0-or-later",
-    "maintainer": {
-        "name": "Anmol Sharma",
-        "email": "anmol@datamol.org"
-    },
-    "requirements": {
-        "yunohost": ">= 11.1.11"
-    },
-    "multi_instance": true,
-    "services": [
-        "nginx",
-        "php8.0-fpm"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "path",
-                "type": "path",
-                "example": "/moodle",
-                "default": "/moodle"
-            },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "default": true
-            },
-			{
-				"name": "admin",
-				"type": "user"
-			},
-            {
-                "name": "site_name",
-                "type": "string",
-                "ask": {
-                    "en": "Choose a name for the site you want to create",
-                    "fr": "Choisissez un nom pour le site que vous voulez créer"
-                },
-                "default": "moodle",
-                "example": "moodle"
-            }
-        ]
-    }
-}
diff --git a/manifest.toml b/manifest.toml
index 49ab68f..30901fd 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://docs.moodle.org/400/en/Main_page"
 code = "https://github.com/moodle/moodle"
 
 [integration]
-yunohost = ">= 11.1.11"
+yunohost = ">= 11.1.12"
 architectures = "all"
 multi_instance = true
 ldap = true
diff --git a/scripts/backup b/scripts/backup
index 20bd0df..4fe1139 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -10,26 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-#REMOVEME? ynh_print_info --message="Loading installation settings..."
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
-#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
-#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
-#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
-#REMOVEME? data_dir=$(ynh_app_setting_get --app=$app --key=data_dir)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
diff --git a/scripts/install b/scripts/install
index 1786d56..891e046 100644
--- a/scripts/install
+++ b/scripts/install
@@ -36,7 +36,6 @@ ynh_script_progression --message="Setting up source files..." --weight=6
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
@@ -86,10 +85,6 @@ ynh_psql_execute_as_root --database="$db_name" --sql="UPDATE public.mdl_user SET
 
 php$phpversion "$install_dir/admin/cli/purge_caches.php"
 
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
 #=================================================
 # ADD CRON JOB
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 06f6592..7327a7b 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 5a2d8bd..b8481b4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,7 +82,6 @@ then
 	ynh_secure_remove --file="$tmpdir"
 fi
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"