1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/moncycle_ynh.git synced 2024-09-03 19:46:16 +02:00

Merge pull request #7 from YunoHost-Apps/testing

Testing
This commit is contained in:
Limezy 2023-02-03 00:54:04 +07:00 committed by GitHub
commit 004442cf3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 21 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Menstrual cycle follow-up for natural family planning
**Shipped version:** 7.0~ynh1
**Shipped version:** 7.0~ynh2
**Demo:** https://tableau.moncycle.app/connexion.php?email1=demo@moncycle.app&mdp=demo

View file

@ -56,7 +56,7 @@ Il existe plusieurs méthodes proposées par différentes associations. Voici un
🧠 moncycle.app n'a pas pour objectif de prédire ou de contrôler la bonne application des méthodes (ni de remplacer vos moniteurs) mais seulement de proposer un support numérique. Vous restez le cerveau derrière votre tableau. Si vous ne connaissez pas les méthodes naturelles ou si vous avez des questions sur les règles de celles-ci, rapprochez-vous d'un moniteur de l'une des associations ci-dessus.
**Version incluse :** 7.0~ynh1
**Version incluse :** 7.0~ynh2
**Démo :** https://tableau.moncycle.app/connexion.php?email1=demo@moncycle.app&mdp=demo

View file

@ -10,3 +10,7 @@
; php_admin_value[max_input_time] = 300
; php_admin_value[memory_limit] = 256M
; php_admin_flag[short_open_tag] = On
; Session lifetime to avoid disconnections on PWA mode
php_admin_value[session.gc_maxlifetime] = 2592000
php_admin_value[session.cookie_lifetime] = 2592000

View file

@ -6,7 +6,7 @@
"en": "Menstrual cycle follow-up for natural family planning",
"fr": "Suivi de cycle pour les méthodes naturelles de régulation de naissance"
},
"version": "7.0~ynh1",
"version": "7.0~ynh2",
"url": "https://moncycle.app",
"upstream": {
"license": "CC-BY-NC-SA-4.0",

View file

@ -103,7 +103,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --usage="low" --footprint="low"
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#=================================================
# NGINX CONFIGURATION

View file

@ -22,6 +22,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
db_user=$db_name
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#=================================================
# CHECK VERSION
@ -74,13 +75,15 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
if [ "$upgrade_type" == "UPGRADE_APP" ]
then
ynh_script_progression --message="Upgrading source files..." --weight=1
ynh_script_progression --message="Upgrading source files..." --weight=1
# Move config.php to temp folder
# Can't use the --keep="config.php" option
pushd "$final_path"
ynh_exec_warn_less mv ./config.php /tmp/
popd
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" --keep="config.php"
fi
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" --full_replace=1
chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
@ -88,6 +91,7 @@ chown -R $app:www-data "$final_path"
pushd "$final_path"
ynh_exec_warn_less mv ./www_data/* .
ynh_exec_warn_less mv /tmp/config.php .
ynh_exec_warn_less ./module/install.sh
popd
@ -105,7 +109,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --phpversion=$phpversion --usage="low" --footprint="low"
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#=================================================
# NGINX CONFIGURATION
@ -115,16 +118,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
# Create a dedicated NGINX config
ynh_add_nginx_config
#=================================================
# CONFIGURATION UPGRADE
#=================================================
#ynh_script_progression --message="Adding a configuration file..." --weight=1
#ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php"
#chmod 400 "$final_path/config.php"
#chown $app:$app "$final_path/config.php"
#=================================================
# GENERIC FINALIZATION
#=================================================