YunoHost-Apps/paheko_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/paheko_ynh.git synced 2024-09-03 19:56:22 +02:00
Code Issues Activity Actions

try also keep the file config.local.user.php

Browse source
This commit is contained in:
rodinux 2023-09-18 22:09:52 +02:00
parent 5fb2427c93
commit 01d57e2983
5 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/config.local.php
View file

@ -6,4 +6,4 @@
* Pour ajouter vos configurations personnalisées, rendez-vous dans le fichier config.local.user.php
*/
require '__INSTALL_DIR__/config.local.yunohost.php';
require '__INSTALL_DIR__/config.local.user.php';
require '__INSTALL_DIR__/data/config.local.user.php';

2
conf/config.local.yunohost.php
View file

@ -5,7 +5,7 @@
*
* Ce fichier sera mis à jour à chaque nouvelle version de Yunohost
*
* Pour ajouter vos configurations personnalisées, rendez-vous dans le fichier config.local.user.php
* Pour ajouter vos configurations personnalisées, rendez-vous dans le fichier data/config.local.user.php
*
*/

4
scripts/install
View file

@ -50,7 +50,7 @@ ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
# Install configuration files
ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php"
ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php"
ynh_add_config --template="config.local.user.php" --destination="$install_dir/data/config.local.user.php"
# Permissions on files and directories
chmod -R o-rwx "$install_dir"
@ -61,7 +61,7 @@ find "$install_dir/data" -type d -exec chmod 770 {} +
find "$install_dir/data" -type f -exec chmod 660 {} +
chmod 440 "$install_dir/config.local.php"
chmod 440 "$install_dir/config.local.yunohost.php"
chmod 660 "$install_dir/config.local.user.php"
chmod 660 "$install_dir/data/config.local.user.php"
#=================================================
# END OF SCRIPT

5
scripts/restore
View file

@ -26,7 +26,12 @@ find "$install_dir/data" -type d -exec chmod 770 {} +
find "$install_dir/data" -type f -exec chmod 660 {} +
chmod 440 "$install_dir/config.local.php"
chmod 440 "$install_dir/config.local.yunohost.php"
if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh4; then
chmod 660 "$install_dir/config.local.user.php"
else
chmod 660 "$install_dir/data/config.local.user.php"
fi
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION

13
scripts/upgrade
View file

@ -30,14 +30,19 @@ if [[ -z "${secret_key:-}" ]]; then
fi
#=================================================
# BACKUP SQLITE DATABASE AND DATAS
# BACKUP DATABASE, DATAS AND CONFIG LOCAL USER
#=================================================
ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5
# copy data directory backup
tmp_data_backup=$(mktemp -d)
rsync -a $install_dir/data/ $tmp_data_backup/
if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh4; then
mv $install_dir/config.local.user.php $tmp_data_backup/
fi
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
@ -47,7 +52,7 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=5
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" --keep="config.local.user.php" --full_replace=1
ynh_setup_source --dest_dir="$install_dir" --full_replace=1
fi
chmod -R o-rwx "$install_dir"
@ -78,7 +83,7 @@ ynh_script_progression --message="Updating a configuration file..." --weight=5
if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; then
chmod 750 "$install_dir/config.local.user.php"
ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php"
ynh_add_config --template="config.local.user.php" --destination="$install_dir/data/config.local.user.php"
fi
# NOTE: Don't overwrite config.local.user.php
@ -107,7 +112,7 @@ find "$install_dir/data" -type d -exec chmod 770 {} +
find "$install_dir/data" -type f -exec chmod 660 {} +
chmod 440 "$install_dir/config.local.php"
chmod 440 "$install_dir/config.local.yunohost.php"
chmod 660 "$install_dir/config.local.user.php"
chmod 660 "$install_dir/data/config.local.user.php"
#=================================================
# FINALISE UPGRADE