diff --git a/README.md b/README.md index 39148a7..12d9503 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Wallabag for YunoHost -[![Integration level](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![Working status](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Working status](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) [![Install Wallabag with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) diff --git a/README_es.md b/README_es.md index 38bec42..7935c38 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Wallabag para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) [![Instalar Wallabag con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) diff --git a/README_eu.md b/README_eu.md index 83a2f58..99d76b3 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Wallabag YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) [![Instalatu Wallabag YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) diff --git a/README_fr.md b/README_fr.md index 0de5e3b..064405d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Wallabag pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) [![Installer Wallabag avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) diff --git a/README_gl.md b/README_gl.md index c893829..c3f4077 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Wallabag para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) [![Instalar Wallabag con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index f23dc4d..f0a8ec7 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Wallabag -[![集成程度](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![工作状态](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) [![使用 YunoHost 安装 Wallabag](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) diff --git a/conf/parameters.yml b/conf/parameters.yml index a3e4f01..474971d 100644 --- a/conf/parameters.yml +++ b/conf/parameters.yml @@ -22,14 +22,17 @@ parameters: fos_oauth_server_refresh_token_lifetime: 1209600 from_email: no-reply@wallabag.org rss_limit: 50 + rabbitmq_host: localhost rabbitmq_port: 5672 rabbitmq_user: guest rabbitmq_password: guest rabbitmq_prefetch_count: 10 + redis_scheme: tcp redis_host: localhost redis_port: 6379 redis_path: null redis_password: null + sentry_dsn: ~ diff --git a/hooks/post_user_create b/hooks/post_user_create index 44fba5b..e15237a 100644 --- a/hooks/post_user_create +++ b/hooks/post_user_create @@ -1,5 +1,8 @@ #!/bin/bash +# Source YunoHost helpers +source /usr/share/yunohost/helpers + app="__APP__" user="__APP__" install_dir=$(ynh_app_setting_get --app="$app" --key=install_dir) @@ -9,9 +12,6 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) username=$1 user_email=$2 -# Source YunoHost helpers -source /usr/share/yunohost/helpers - # Generate a random password user_pass=$(ynh_string_random) diff --git a/hooks/post_user_delete b/hooks/post_user_delete index ebf27c4..b181ac1 100644 --- a/hooks/post_user_delete +++ b/hooks/post_user_delete @@ -1,5 +1,8 @@ #!/bin/bash +# Source YunoHost helpers +source /usr/share/yunohost/helpers + app="__APP__" user="__APP__" install_dir=$(ynh_app_setting_get --app="$app" --key=install_dir) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1cb5feb..89026c8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,11 @@ YNH_COMPOSER_VERSION="2.7.7" -wb_conf="$install_dir/app/config/parameters.yml" +# Define a function to execute commands with `php_exec` +php_exec() { + (cd "$install_dir" && ynh_exec_as "$app" \ + php${phpversion} "$install_dir/bin/console" --no-interaction --env=prod "$@") +} #================================================= # PERSONAL HELPERS diff --git a/scripts/change_url b/scripts/change_url index ae6fd3f..05e3046 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name <<< "UPDATE internal_setting SET value = 'https://$new_domain$new_path' WHERE name = 'wallabag_url'" # Change domain name in parameters.yml -ynh_replace_string --target_file="$wb_conf" --match_string="domain_name: .*" --replace_string="domain_name: https://$new_domain$new_path" +ynh_replace_string --target_file="$install_dir/app/config/parameters.yml" --match_string="domain_name: .*" --replace_string="domain_name: https://$new_domain$new_path" # If "Download images locally" option has been enabled in Internal Settings download_images_enabled=$(ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" \ diff --git a/scripts/install b/scripts/install index 90c965d..8a16ab5 100644 --- a/scripts/install +++ b/scripts/install @@ -56,22 +56,22 @@ ynh_add_config --template="parameters.yml" --destination="$wb_conf" chmod 600 "$wb_conf" chown "$app:www-data" "$wb_conf" -# Alias for php-cli execution command -php_exec=("php$phpversion" "$install_dir/bin/console" --no-interaction --env=prod) +chmod 600 "$install_dir/app/config/parameters.yml" +chown "$app:$app" "$install_dir/app/config/parameters.yml" # Install dependencies and Wallabag -ynh_exec_warn_less ynh_exec_as "$app" "${php_exec[@]}" wallabag:install +php_exec wallabag:install # Add users to Wallabag for username in $(ynh_user_list); do user_email=$(ynh_user_get_info --username="$username" --key=mail) # We don't care about that thanks to LDAP user_pass=$(ynh_string_random) - ynh_exec_as "$app" "${php_exec[@]}" fos:user:create "$username" "$user_email" "$user_pass" + php_exec fos:user:create "$username" "$user_email" "$user_pass" done # Set admin user -ynh_exec_as "$app" "${php_exec[@]}" fos:user:promote --super "$admin" +php_exec fos:user:promote --super "$admin" # Configure Wallabag instance URL ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" \ diff --git a/scripts/restore b/scripts/restore index d9fc61c..dd1c787 100644 --- a/scripts/restore +++ b/scripts/restore @@ -23,8 +23,6 @@ if [ -e "$install_dir/var/cache/prod/appProdProjectContainer.php" ]; then chmod 700 "$install_dir/var/cache/prod/appProdProjectContainer.php" fi -chmod 600 "$wb_conf" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index cf0597c..393aeea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -54,8 +54,8 @@ chown "$app:www-data" "$wb_conf" php_exec=("php$phpversion" "$install_dir/bin/console" --no-interaction --env=prod) # Upgrade database and clear the cache -ynh_exec_as "$app" "${php_exec[@]}" doctrine:migrations:migrate -ynh_exec_as "$app" "${php_exec[@]}" cache:clear +php_exec doctrine:migrations:migrate +php_exec cache:clear # Configure Wallabag instance URL ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" \