Merge pull request #2 from YunoHost-Apps/testing

Testing

README.md

@@ -46,7 +46,7 @@ GRR is fully configurable (management of schedules, access, emails ...) and rema
 - The possibility of reserving or freeing very quickly whole days simultaneously on several resources of several domains and according to a calendar.
 
 
-**Shipped version:** 3.4.2b~ynh1
+**Shipped version:** 3.4.3a~ynh1
 
 
 

README_fr.md

@@ -42,7 +42,7 @@ GRR est entièrement configurable (gestion des horaires, des accés, mails...) e
 - La possibilité de réserver ou de libérer très rapidement des journées entières simultanément sur plusieurs ressources de plusieurs domaines et selon un calendrier.
 
 
-**Version incluse :** 3.4.2b~ynh1
+**Version incluse :** 3.4.3a~ynh1
 
 
 

conf/app.src

@@ -1,9 +1,9 @@
-SOURCE_URL=https://github.com/JeromeDevome/GRR/archive/refs/tags/v.3.4.2b.tar.gz
-SOURCE_SUM=6397265b55b7092b087b5083b3f7aeab159e911982021861a653906c31e5cc85
+SOURCE_URL=https://github.com/JeromeDevome/GRR/archive/refs/tags/v3.4.3a.tar.gz
+SOURCE_SUM=e46721ac15f426585d7b058db620fc7c600016241963aeb751b82accd608bca2
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=v.3.4.2b.tar.gz
+SOURCE_FILENAME=v3.4.3a.tar.gz
 SOURCE_EXTRACT=true
 
 

conf/connect.inc.php

@@ -4,4 +4,5 @@ $dbDb="__DB_NAME__";
 $dbUser="__DB_USER__";
 $dbPass="__DB_PWD__";
 $dbPort="3306";
+$apikey=""
 ?>

manifest.json

@@ -6,7 +6,7 @@
         "en": "A tool for booking meeting rooms or other resources.",
         "fr": "Un outil de réservation de salles de réunion ou d'autres ressources."
     },
-    "version": "3.4.2b~ynh1",
+    "version": "3.4.3a~ynh1",
     "url": "https://site.devome.com/fr/grr3",
     "upstream": {
         "license": "GPL",

scripts/upgrade

@@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 
 #=================================================
 # CHECK VERSION
@@ -60,6 +61,7 @@ if [ -z "$db_name" ]; then
 	db_name=$(ynh_sanitize_dbid --db_name=$app)
 	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 fi
+db_user=$db_name
 
 # If final_path doesn't exist, create it
 if [ -z "$final_path" ]; then
@@ -125,6 +127,14 @@ ynh_add_fpm_config
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=1
 
+ynh_add_config --template="config_ldap.inc.php" --destination="$final_path/include/config_ldap.inc.php"
+ynh_add_config --template="connect.inc.php" --destination="$final_path/include/connect.inc.php"
+
+chmod 400 "$final_path/include/config_ldap.inc.php"
+chmod 400 "$final_path/include/connect.inc.php"
+chown $app:$app "$final_path/include/config_ldap.inc.php"
+chown $app:$app "$final_path/include/connect.inc.php"
+
 ### Same as during install
 ###
 ### The file will automatically be backed-up if it's found to be manually modified (because
@@ -145,6 +155,17 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1
 ### ynh_replace_string --match_string="match_string" --replace_string="replace_string" --target_file="$final_path/some_config_file"
 ### ynh_store_file_checksum --file="$final_path/some_config_file"
 
+#=================================================
+# UPDATE DATABASE
+#=================================================
+ynh_script_progression --message="Updating database..." --weight=1
+
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+
+pushd $final_path/admin
+php${phpversion} admin_maj.php ""
+popd
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================