1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/wallabag2_ynh.git synced 2024-10-01 13:35:06 +02:00

Merge branch 'version-2.6' into v2

This commit is contained in:
Éric Gaspar 2023-11-16 16:01:12 +01:00
commit 2cf96f547f
3 changed files with 6 additions and 6 deletions

View file

@ -36,7 +36,7 @@ ynh_add_fpm_config
#=================================================
# CONFIGURE WALLABAG
#=================================================
ynh_script_progression --message="Configuring wallabag..." --weight=25
ynh_script_progression --message="Configuring $app..." --weight=25
ynh_add_config --template="parameters.yml" --destination="$install_dir/app/config/parameters.yml"
@ -47,7 +47,7 @@ php_exec="ynh_exec_as $app php$phpversion "$install_dir/bin/console" --no-intera
chown -R $app: $install_dir
# Install dependencies and Wallabag
$php_exec wallabag:install
ynh_exec_warn_less $php_exec wallabag:install
# Add users to Wallabag
for username in $(ynh_user_list)

View file

@ -43,7 +43,7 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=6
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" --keep ="app/config/parameters.yml"
ynh_setup_source --dest_dir="$install_dir" --keep="app/config/parameters.yml"
# Clear cache
ynh_secure_remove --file="$install_dir/var/cache"
@ -83,7 +83,7 @@ ynh_use_logrotate --non-append
if [ "$upgrade_type" == "UPGRADE_APP" ]
then
ynh_script_progression --message="Reconfiguring wallabag..." --weight=1
ynh_script_progression --message="Reconfiguring $app..." --weight=1
# Copy and set Wallabag dist configuration
ynh_add_config --template="parameters.yml" --destination="$install_dir/app/config/parameters.yml"
@ -93,7 +93,7 @@ then
#=================================================
# Alias for php-cli execution command
php_exec="ynh_exec_as $app php${YNH_PHP_VERSION} "$install_dir/bin/console" --no-interaction --env=prod"
php_exec="ynh_exec_as $app php$phpversion "$install_dir/bin/console" --no-interaction --env=prod"
# Set permissions to app files
chown -R $app: $install_dir

View file

@ -14,4 +14,4 @@ test_format = 1.0
# Commits to test upgrade from
# -------------------------------
test_upgrade_from.bac6d108163e7ef7f4d36296aeb4f299258ced29.name = "Upgrade from 2.5.4~ynh2"
test_upgrade_from.e9459b2bc46728427bda81e2043f3b4116771e2d.name = "Upgrade from 2.5.4~ynh2"