From e7da51df858f84f53dedcd1621f54b401b45d2a8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 13 May 2024 17:53:17 +0200 Subject: [PATCH 01/24] Upgrade to v2.6.9 https://github.com/wallabag/wallabag/releases/tag/2.6.9 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index b4f08d6..0b56101 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Wallabag" description.en = "Save and classify articles. Read them later" description.fr = "Enregistrez et classez les articles. Lisez-les plus tard" -version = "2.5.4~ynh3" +version = "2.6.9~ynh1" maintainers = ["lapineige"] @@ -47,8 +47,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/wallabag/wallabag/releases/download/2.5.4/wallabag-2.5.4.tar.gz" - sha256 = "c953105e3181f18bf592541a1c46c318c6663ad00d4687052676b02a7d74c618" + url = "https://github.com/wallabag/wallabag/releases/download/2.6.9/wallabag-2.6.9.tar.gz" + sha256 = "578b39ff2f5f140999f969d4c54d37532462bc48a10f565429038eab84cb10ac" autoupdate.strategy = "latest_github_release" autoupdate.asset = ".*\\.tar\\.gz" From 67ac61f97a3b0f0f56b3e04e8c6362d63f8bb7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 11 Jun 2024 11:56:55 +0200 Subject: [PATCH 02/24] Update patches --- sources/patches/main-00-ldap-auth.patch | 29 ++++++++++----- .../main-01-logout-success-handler.patch | 36 +++++++++++++------ .../patches/main-02-oauth-workaround.patch | 34 ++++++++++++------ 3 files changed, 69 insertions(+), 30 deletions(-) diff --git a/sources/patches/main-00-ldap-auth.patch b/sources/patches/main-00-ldap-auth.patch index 3a36f5e..52a0561 100644 --- a/sources/patches/main-00-ldap-auth.patch +++ b/sources/patches/main-00-ldap-auth.patch @@ -1,5 +1,15 @@ +From e8027b881cffa0ed75de2c809fd88cf3cee42a0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= +Date: Tue, 11 Jun 2024 11:50:36 +0200 +Subject: [PATCH 1/4] Add ldap auth + +--- + app/config/security.yml | 11 +++++++++++ + app/config/services.yml | 4 ++++ + 2 files changed, 15 insertions(+) + diff --git a/app/config/security.yml b/app/config/security.yml -index 02afc9ea..5a3f7a34 100644 +index 9ab51621..675d8905 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -13,6 +13,14 @@ security: @@ -14,11 +24,11 @@ index 02afc9ea..5a3f7a34 100644 + search_password: + filter: (&(uid={username})(objectClass=posixAccount)) + default_roles: ROLE_USER - + # the main part of the security, where you can set up firewalls # for specific sections of your app -@@ -38,6 +46,9 @@ security: - +@@ -39,6 +47,9 @@ security: + secured_area: pattern: ^/ + http_basic_ldap: @@ -28,13 +38,13 @@ index 02afc9ea..5a3f7a34 100644 provider: fos_userbundle csrf_token_generator: security.csrf.token_manager diff --git a/app/config/services.yml b/app/config/services.yml -index 7b85d846..f23961c5 100644 +index 270e79d9..efdd34d5 100644 --- a/app/config/services.yml +++ b/app/config/services.yml -@@ -43,6 +43,10 @@ services: +@@ -176,6 +176,10 @@ services: tags: - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - + + yunohost.ldap: + class: Symfony\Component\Ldap\LdapClient + arguments: ["localhost"] @@ -42,5 +52,6 @@ index 7b85d846..f23961c5 100644 craue_config_cache_provider: class: Symfony\Component\Cache\Adapter\FilesystemAdapter public: false --- -2.17.1 +-- +2.45.1 + diff --git a/sources/patches/main-01-logout-success-handler.patch b/sources/patches/main-01-logout-success-handler.patch index d321d54..5fac906 100644 --- a/sources/patches/main-01-logout-success-handler.patch +++ b/sources/patches/main-01-logout-success-handler.patch @@ -1,24 +1,37 @@ +From 1a9312652c4ecb7b84aed0328c294b105763f816 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= +Date: Tue, 11 Jun 2024 11:52:33 +0200 +Subject: [PATCH 2/4] Configure a custom logout success handler for yunohost + ldap + +--- + app/config/security.yml | 2 +- + app/config/services.yml | 4 +++ + .../Security/LogoutSuccessHandler.php | 27 +++++++++++++++++++ + 3 files changed, 32 insertions(+), 1 deletion(-) + create mode 100644 src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php + diff --git a/app/config/security.yml b/app/config/security.yml -index 5a3f7a34..1720e741 100644 +index 675d8905..876f4471 100644 --- a/app/config/security.yml +++ b/app/config/security.yml -@@ -62,7 +62,7 @@ security: - +@@ -63,7 +63,7 @@ security: + logout: path: /logout - target: / + success_handler: yunohost.logout_success_handler - - access_control: - - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } + + two_factor: + provider: fos_userbundle diff --git a/app/config/services.yml b/app/config/services.yml -index f23961c5..f266e6d1 100644 +index efdd34d5..584b63c6 100644 --- a/app/config/services.yml +++ b/app/config/services.yml -@@ -43,6 +43,10 @@ services: +@@ -176,6 +176,10 @@ services: tags: - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - + + yunohost.logout_success_handler: + class: Wallabag\YunoHostBundle\Security\LogoutSuccessHandler + @@ -59,5 +72,6 @@ index 00000000..b3268243 + return new RedirectResponse($url); + } +} --- -2.17.1 +-- +2.45.1 + diff --git a/sources/patches/main-02-oauth-workaround.patch b/sources/patches/main-02-oauth-workaround.patch index 6326570..20c5476 100644 --- a/sources/patches/main-02-oauth-workaround.patch +++ b/sources/patches/main-02-oauth-workaround.patch @@ -1,11 +1,25 @@ ---- a/vendor/friendsofsymfony/oauth-server-bundle/Storage/OAuthStorage.php 2016-02-22 13:57:55.000000000 +0000 -+++ b/vendor/friendsofsymfony/oauth-server-bundle/Storage/OAuthStorage.php 2017-04-13 17:16:06.298501506 +0000 -@@ -170,7 +170,7 @@ - if (null !== $user) { - $encoder = $this->encoderFactory->getEncoder($user); +From 7dc04c8bc50149998aa03a31f31674535a98ada9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= +Date: Tue, 11 Jun 2024 11:54:25 +0200 +Subject: [PATCH 4/4] OAuthStorage workaround + +--- + .../oauth-server-bundle/Storage/OAuthStorage.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vendor/friendsofsymfony/oauth-server-bundle/Storage/OAuthStorage.php b/vendor/friendsofsymfony/oauth-server-bundle/Storage/OAuthStorage.php +index 5ab6b7c9..7cb77913 100644 +--- a/vendor/friendsofsymfony/oauth-server-bundle/Storage/OAuthStorage.php ++++ b/vendor/friendsofsymfony/oauth-server-bundle/Storage/OAuthStorage.php +@@ -158,7 +158,7 @@ class OAuthStorage implements IOAuth2RefreshTokens, IOAuth2GrantUser, IOAuth2Gra + } + + $encoder = $this->encoderFactory->getEncoder($user); +- if ($encoder->isPasswordValid($user->getPassword(), $password, $user->getSalt())) { ++ if (true) { + return [ + 'data' => $user, + ]; +-- +2.45.1 -- if ($encoder->isPasswordValid($user->getPassword(), $password, $user->getSalt())) { -+ if (true) { - return array( - 'data' => $user, - ); From 3d25d5a0d40d5879d528da6c8f49b35ad46961d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 15 Mar 2024 13:21:59 +0100 Subject: [PATCH 03/24] Use ynh_add_config for parameters.yml instead of modifying the source file --- conf/parameters.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++ scripts/install | 14 ++------- scripts/upgrade | 13 ++------- 3 files changed, 73 insertions(+), 23 deletions(-) create mode 100644 conf/parameters.yml diff --git a/conf/parameters.yml b/conf/parameters.yml new file mode 100644 index 0000000..5b5f803 --- /dev/null +++ b/conf/parameters.yml @@ -0,0 +1,69 @@ +# This file is a "template" of what your parameters.yml file should look like +parameters: + # Uncomment these settings or manually update your parameters.yml + # to use docker-compose + # + # database_driver: %env.database_driver% + # database_host: %env.database_host% + # database_port: %env.database_port% + # database_name: %env.database_name% + # database_user: %env.database_user% + # database_password: %env.database_password% + + database_driver: pdo_mysql + database_host: 127.0.0.1 + database_port: ~ + database_name: __DB_NAME__ + database_user: __DB_USER__ + database_password: __DB_PWD__ + # For SQLite, database_path should be "%kernel.project_dir%/data/db/wallabag.sqlite" + database_path: null + database_table_prefix: null + database_socket: null + # with PostgreSQL and SQLite, you must set "utf8" + database_charset: utf8mb4 + + domain_name: https://__DOMAIN____PATH__ + server_name: "Your wallabag instance" + + #mailer_dsn: smtp://user:pass@__DOMAIN__:25 + mailer_dsn: sendmail://default + + locale: en + + # A secret key that's used to generate certain security-related tokens + secret: __DESKEY__ + + # two factor stuff + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org + + # fosuser stuff + fosuser_registration: false + fosuser_confirmation: true + + # how long the access token should live in seconds for the API + fos_oauth_server_access_token_lifetime: 3600 + # how long the refresh token should life in seconds for the API + fos_oauth_server_refresh_token_lifetime: 1209600 + + from_email: no-reply@wallabag.org + + rss_limit: 50 + + # RabbitMQ processing + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + rabbitmq_prefetch_count: 10 + + # Redis processing + redis_scheme: tcp + redis_host: localhost + redis_port: 6379 + redis_path: null + redis_password: null + + # sentry logging + sentry_dsn: ~ diff --git a/scripts/install b/scripts/install index 21f3764..c8914fd 100644 --- a/scripts/install +++ b/scripts/install @@ -40,19 +40,9 @@ fi #================================================= ynh_script_progression --message="Adding $app's configuration files..." --weight=1 -# Copy and set Wallabag dist configuration -cp "$install_dir/app/config/parameters.yml.dist" "$wb_conf" - -ynh_replace_string --target_file="$wb_conf" --match_string="fosuser_registration: true" --replace_string="fosuser_registration: false" -ynh_replace_string --target_file="$wb_conf" --match_string="database_name: wallabag" --replace_string="database_name: $db_name" -ynh_replace_string --target_file="$wb_conf" --match_string="database_user: root" --replace_string="database_user: $db_user" -ynh_replace_string --target_file="$wb_conf" --match_string="database_password: ~" --replace_string="database_password: $db_pwd" -ynh_replace_string --target_file="$wb_conf" --match_string="database_table_prefix: wallabag_" --replace_string="database_table_prefix: null" -ynh_replace_string --target_file="$wb_conf" --match_string="secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv" --replace_string="secret: $deskey" -ynh_replace_string --target_file="$wb_conf" --match_string="domain_name: https://your-wallabag-url-instance.com" --replace_string="domain_name: https://$domain$path" - +ynh_add_config --template="parameters.yml" --destination="$wb_conf" chmod 600 "$wb_conf" -chown -R "$app:www-data" "$install_dir" +chown "$app:www-data" "$wb_conf" # Alias for php-cli execution command php_exec=("php$phpversion" "$install_dir/bin/console" --no-interaction --env=prod) diff --git a/scripts/upgrade b/scripts/upgrade index 605472d..5b6cab2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,18 +38,9 @@ fi ynh_script_progression --message="Reconfiguring $app..." --weight=1 # Copy and set Wallabag dist configuration -cp "$install_dir/app/config/parameters.yml.dist" "$wb_conf" - -ynh_replace_string --target_file="$wb_conf" --match_string="fosuser_registration: true" --replace_string="fosuser_registration: false" -ynh_replace_string --target_file="$wb_conf" --match_string="database_name: wallabag" --replace_string="database_name: $db_name" -ynh_replace_string --target_file="$wb_conf" --match_string="database_user: root" --replace_string="database_user: $db_user" -ynh_replace_string --target_file="$wb_conf" --match_string="database_password: ~" --replace_string="database_password: $db_pwd" -ynh_replace_string --target_file="$wb_conf" --match_string="database_table_prefix: wallabag_" --replace_string="database_table_prefix: null" -ynh_replace_string --target_file="$wb_conf" --match_string="secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv" --replace_string="secret: $deskey" -ynh_replace_string --target_file="$wb_conf" --match_string="domain_name: https://your-wallabag-url-instance.com" --replace_string="domain_name: https://$domain$path" - +ynh_add_config --template="parameters.yml" --destination="$wb_conf" chmod 600 "$wb_conf" -chown -R "$app:www-data" "$install_dir" +chown "$app:www-data" "$wb_conf" # Alias for php-cli execution command php_exec=("php$phpversion" "$install_dir/bin/console" --no-interaction --env=prod) From 99c7b1443604e42b92528d9598e06af160544347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 15 Mar 2024 13:48:05 +0100 Subject: [PATCH 04/24] Rewrite parameters.yml from upstream sources for v2.6 --- conf/parameters.yml | 42 ++++-------------------------------------- manifest.toml | 1 + 2 files changed, 5 insertions(+), 38 deletions(-) diff --git a/conf/parameters.yml b/conf/parameters.yml index 5b5f803..a3e4f01 100644 --- a/conf/parameters.yml +++ b/conf/parameters.yml @@ -1,69 +1,35 @@ -# This file is a "template" of what your parameters.yml file should look like +# This file is auto-generated during the composer install parameters: - # Uncomment these settings or manually update your parameters.yml - # to use docker-compose - # - # database_driver: %env.database_driver% - # database_host: %env.database_host% - # database_port: %env.database_port% - # database_name: %env.database_name% - # database_user: %env.database_user% - # database_password: %env.database_password% - database_driver: pdo_mysql database_host: 127.0.0.1 database_port: ~ database_name: __DB_NAME__ database_user: __DB_USER__ database_password: __DB_PWD__ - # For SQLite, database_path should be "%kernel.project_dir%/data/db/wallabag.sqlite" database_path: null database_table_prefix: null database_socket: null - # with PostgreSQL and SQLite, you must set "utf8" database_charset: utf8mb4 - - domain_name: https://__DOMAIN____PATH__ - server_name: "Your wallabag instance" - - #mailer_dsn: smtp://user:pass@__DOMAIN__:25 - mailer_dsn: sendmail://default - + domain_name: 'https://__DOMAIN____PATH__' + server_name: 'Your wallabag instance' + mailer_dsn: smtp://__APP__:__MAIL_PWD__@__DOMAIN__:25 locale: en - - # A secret key that's used to generate certain security-related tokens secret: __DESKEY__ - - # two factor stuff - twofactor_auth: true twofactor_sender: no-reply@wallabag.org - - # fosuser stuff fosuser_registration: false fosuser_confirmation: true - - # how long the access token should live in seconds for the API fos_oauth_server_access_token_lifetime: 3600 - # how long the refresh token should life in seconds for the API fos_oauth_server_refresh_token_lifetime: 1209600 - from_email: no-reply@wallabag.org - rss_limit: 50 - - # RabbitMQ processing rabbitmq_host: localhost rabbitmq_port: 5672 rabbitmq_user: guest rabbitmq_password: guest rabbitmq_prefetch_count: 10 - - # Redis processing redis_scheme: tcp redis_host: localhost redis_port: 6379 redis_path: null redis_password: null - - # sentry logging sentry_dsn: ~ diff --git a/manifest.toml b/manifest.toml index 0b56101..9f4f6b9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,6 +54,7 @@ ram.runtime = "50M" autoupdate.asset = ".*\\.tar\\.gz" [resources.system_user] + allow_email = true [resources.install_dir] From 8dd9efbe75590f1f02f478243423ce32f42f2451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 15 Mar 2024 13:22:48 +0100 Subject: [PATCH 05/24] Add foreign-keys-removal.sql for database migration --- conf/foreign-keys-removal.sql | 12 ++++++++++++ scripts/upgrade | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 conf/foreign-keys-removal.sql diff --git a/conf/foreign-keys-removal.sql b/conf/foreign-keys-removal.sql new file mode 100644 index 0000000..0ebad2c --- /dev/null +++ b/conf/foreign-keys-removal.sql @@ -0,0 +1,12 @@ +# Drop old foreign keys + +ALTER TABLE `oauth2_access_tokens` DROP FOREIGN KEY IF EXISTS FK_D247A21BA76ED395; +ALTER TABLE `oauth2_access_tokens` DROP FOREIGN KEY IF EXISTS FK_D247A21B19EB6921; +ALTER TABLE `oauth2_auth_codes` DROP FOREIGN KEY IF EXISTS FK_A018A10DA76ED395; +ALTER TABLE `oauth2_clients` DROP FOREIGN KEY IF EXISTS FK_F9D02AE6A76ED395; +ALTER TABLE `oauth2_refresh_tokens` DROP FOREIGN KEY IF EXISTS FK_D394478CA76ED395; +ALTER TABLE `config` DROP FOREIGN KEY IF EXISTS FK_D48A2F7CA76ED395; +ALTER TABLE `entry` DROP FOREIGN KEY IF EXISTS FK_2B219D70A76ED395; +ALTER TABLE `oauth2_auth_codes` DROP FOREIGN KEY IF EXISTS FK_A018A10D19EB6921; +ALTER TABLE `oauth2_refresh_tokens` DROP FOREIGN KEY IF EXISTS FK_D394478C19EB6921; +ALTER TABLE `tagging_rule` DROP FOREIGN KEY IF EXISTS FK_1AF95E7824DB0683; diff --git a/scripts/upgrade b/scripts/upgrade index 5b6cab2..cf0597c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -10,7 +10,15 @@ source /usr/share/yunohost/helpers #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -# ynh_script_progression --message="Ensuring downward compatibility..." +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +if ynh_compare_current_package_version --comparison lt --version "2.4~ynh1"; then + # Migrate old (erroneous) database scheme (see: https://github.com/YunoHost-Apps/wallabag2_ynh/pull/125#issuecomment-1041426972) + ynh_script_progression --message="Migrating old (pre-2018) database scheme..." --weight=11 + + ynh_exec_warn_less ynh_mysql_execute_file_as_root --database="$db_name" --file="../conf/foreign-keys-removal.sql" + ynh_script_progression --message="Database migration done. Resuming normal upgrade process" --weight=11 +fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE From 3dd5368b372a32a1274710a0d3dac8327254b647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 15 Mar 2024 13:25:12 +0100 Subject: [PATCH 06/24] Bump PHP vo 8.2 --- manifest.toml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.toml b/manifest.toml index 9f4f6b9..f2a95ca 100644 --- a/manifest.toml +++ b/manifest.toml @@ -64,18 +64,18 @@ ram.runtime = "50M" [resources.apt] packages = [ "mariadb-server", - "php7.4-cli", - "php7.4-curl", - "php7.4-gd", - "php7.4-gettext", - "php7.4-intl", - "php7.4-json", - "php7.4-ldap", - "php7.4-mbstring", - "php7.4-mysql", - "php7.4-redis", - "php7.4-tidy", - "php7.4-xml", + "php8.2-cli", + "php8.2-curl", + "php8.2-gd", + "php8.2-gettext", + "php8.2-intl", + "php8.2-json", + "php8.2-ldap", + "php8.2-mbstring", + "php8.2-mysql", + "php8.2-redis", + "php8.2-tidy", + "php8.2-xml", ] [resources.database] From 53cb6b67aae50cff0931277ca67dec6b0dd7cfa5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 11 Jun 2024 09:29:30 +0000 Subject: [PATCH 07/24] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5f9eaed..39148a7 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Shipped version:** 2.5.4~ynh3 +**Shipped version:** 2.6.9~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 968ab78..38bec42 100644 --- a/README_es.md +++ b/README_es.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Versión actual:** 2.5.4~ynh3 +**Versión actual:** 2.6.9~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 07dee23..83a2f58 100644 --- a/README_eu.md +++ b/README_eu.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Paketatutako bertsioa:** 2.5.4~ynh3 +**Paketatutako bertsioa:** 2.6.9~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 898967b..0de5e3b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Sont disponibles une interface web, des add-ons pour navigateurs (Firefox/Chrome La mise à niveau depuis le paquet YunoHost de [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) demande une opération manuelle, c'est pourquoi un nouveau paquet est fournit. Pour le processus de migration, merci de vous référer à [la documentation officiel de Wallabag](https://doc.wallabag.org/fr/user/import/wallabagv1.html). -**Version incluse :** 2.5.4~ynh3 +**Version incluse :** 2.6.9~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 60cdef2..c893829 100644 --- a/README_gl.md +++ b/README_gl.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Versión proporcionada:** 2.5.4~ynh3 +**Versión proporcionada:** 2.6.9~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index cdd221c..f23dc4d 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**分发版本：** 2.5.4~ynh3 +**分发版本：** 2.6.9~ynh1 **演示：** From 15a551960226b6932fb7c9c393e1e26c508ec2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 11 Jun 2024 12:05:39 +0200 Subject: [PATCH 08/24] Fix ldap auth patch: specify provider --- sources/patches/main-00-ldap-auth.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/patches/main-00-ldap-auth.patch b/sources/patches/main-00-ldap-auth.patch index 52a0561..603ddf7 100644 --- a/sources/patches/main-00-ldap-auth.patch +++ b/sources/patches/main-00-ldap-auth.patch @@ -27,11 +27,12 @@ index 9ab51621..675d8905 100644 # the main part of the security, where you can set up firewalls # for specific sections of your app -@@ -39,6 +47,9 @@ security: +@@ -39,6 +47,10 @@ security: secured_area: pattern: ^/ + http_basic_ldap: ++ provider: yunohost_users + service: yunohost.ldap + dn_string: "uid={username},ou=users,dc=yunohost,dc=org" form_login: @@ -54,4 +55,3 @@ index 270e79d9..efdd34d5 100644 public: false -- 2.45.1 - From bfad1526479fcb720a533f415963c00a55249d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 11 Jun 2024 12:20:10 +0200 Subject: [PATCH 09/24] Use the new Ldap symfony component --- sources/patches/main-00-ldap-auth.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sources/patches/main-00-ldap-auth.patch b/sources/patches/main-00-ldap-auth.patch index 603ddf7..def9f26 100644 --- a/sources/patches/main-00-ldap-auth.patch +++ b/sources/patches/main-00-ldap-auth.patch @@ -47,8 +47,11 @@ index 270e79d9..efdd34d5 100644 - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } + yunohost.ldap: -+ class: Symfony\Component\Ldap\LdapClient -+ arguments: ["localhost"] ++ class: Symfony\Component\Ldap\Ldap ++ arguments: ['@Symfony\Component\Ldap\Adapter\ExtLdap\Adapter'] ++ Symfony\Component\Ldap\Adapter\ExtLdap\Adapter: ++ arguments: ++ - host: localhost + craue_config_cache_provider: class: Symfony\Component\Cache\Adapter\FilesystemAdapter From 6d64ca4884ac4162e01cbc5501fd5507efcccac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 15 Jun 2024 22:39:44 +0200 Subject: [PATCH 10/24] Try to fix ldap config --- sources/patches/main-00-ldap-auth.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/patches/main-00-ldap-auth.patch b/sources/patches/main-00-ldap-auth.patch index def9f26..f1f61be 100644 --- a/sources/patches/main-00-ldap-auth.patch +++ b/sources/patches/main-00-ldap-auth.patch @@ -18,7 +18,7 @@ index 9ab51621..675d8905 100644 id: fos_user.user_provider.username_email + yunohost_users: + ldap: -+ service: yunohost.ldap ++ service: Symfony\Component\Ldap\Ldap + base_dn: ou=users,dc=yunohost,dc=org + search_dn: + search_password: @@ -33,7 +33,7 @@ index 9ab51621..675d8905 100644 pattern: ^/ + http_basic_ldap: + provider: yunohost_users -+ service: yunohost.ldap ++ service: Symfony\Component\Ldap\Ldap + dn_string: "uid={username},ou=users,dc=yunohost,dc=org" form_login: provider: fos_userbundle @@ -46,9 +46,9 @@ index 270e79d9..efdd34d5 100644 tags: - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } -+ yunohost.ldap: -+ class: Symfony\Component\Ldap\Ldap ++ Symfony\Component\Ldap\Ldap: + arguments: ['@Symfony\Component\Ldap\Adapter\ExtLdap\Adapter'] ++ tags: [ldap] + Symfony\Component\Ldap\Adapter\ExtLdap\Adapter: + arguments: + - host: localhost From af79bc0f73a400c4b6507b25bc3efc17337d29dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 15 Jun 2024 23:21:23 +0200 Subject: [PATCH 11/24] Add symfony/ldap --- scripts/install | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/install b/scripts/install index c8914fd..5be8ea7 100644 --- a/scripts/install +++ b/scripts/install @@ -35,6 +35,15 @@ if [ -e "$install_dir/var/cache/prod/appProdProjectContainer.php" ]; then chmod 700 "$install_dir/var/cache/prod/appProdProjectContainer.php" fi +#================================================= +# INSTALL SYMFONY LDAP +#================================================= +ynh_script_progression --message="Installing dependencies for LDAP..." --weight=1 + +ynh_install_composer +ynh_composer_exec --workdir="$install_dir/sources" --commands="require symfony/ldap" +chown -R "$app:www-data" "$install_dir" + #================================================= # APP INITIAL CONFIGURATION #================================================= From 43e009498a51d2db6e4e81208b0cbe16f8275fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 17 Jun 2024 19:19:19 +0200 Subject: [PATCH 12/24] Fix patches --- sources/patches/main-00-ldap-auth.patch | 26 ++++++++--------- .../main-01-logout-success-handler.patch | 28 ++++++++----------- .../patches/main-02-oauth-workaround.patch | 4 +-- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/sources/patches/main-00-ldap-auth.patch b/sources/patches/main-00-ldap-auth.patch index f1f61be..8e9a0d8 100644 --- a/sources/patches/main-00-ldap-auth.patch +++ b/sources/patches/main-00-ldap-auth.patch @@ -1,15 +1,15 @@ -From e8027b881cffa0ed75de2c809fd88cf3cee42a0a Mon Sep 17 00:00:00 2001 +From 488b781e030637ab6feafc0da640217e1d654ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 11 Jun 2024 11:50:36 +0200 -Subject: [PATCH 1/4] Add ldap auth +Subject: [PATCH 1/3] Add ldap auth --- - app/config/security.yml | 11 +++++++++++ - app/config/services.yml | 4 ++++ - 2 files changed, 15 insertions(+) + app/config/security.yml | 12 ++++++++++++ + app/config/services.yml | 7 +++++++ + 2 files changed, 19 insertions(+) diff --git a/app/config/security.yml b/app/config/security.yml -index 9ab51621..675d8905 100644 +index 9ab51621..f4ea3d47 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -13,6 +13,14 @@ security: @@ -39,22 +39,20 @@ index 9ab51621..675d8905 100644 provider: fos_userbundle csrf_token_generator: security.csrf.token_manager diff --git a/app/config/services.yml b/app/config/services.yml -index 270e79d9..efdd34d5 100644 +index 270e79d9..c67341e8 100644 --- a/app/config/services.yml +++ b/app/config/services.yml -@@ -176,6 +176,10 @@ services: +@@ -394,3 +394,10 @@ services: + public: false tags: - - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - + - { name: pagerfanta.view, alias: default_wallabag } ++ + Symfony\Component\Ldap\Ldap: + arguments: ['@Symfony\Component\Ldap\Adapter\ExtLdap\Adapter'] + tags: [ldap] + Symfony\Component\Ldap\Adapter\ExtLdap\Adapter: + arguments: + - host: localhost -+ - craue_config_cache_provider: - class: Symfony\Component\Cache\Adapter\FilesystemAdapter - public: false -- 2.45.1 + diff --git a/sources/patches/main-01-logout-success-handler.patch b/sources/patches/main-01-logout-success-handler.patch index 5fac906..505c9f9 100644 --- a/sources/patches/main-01-logout-success-handler.patch +++ b/sources/patches/main-01-logout-success-handler.patch @@ -1,21 +1,21 @@ -From 1a9312652c4ecb7b84aed0328c294b105763f816 Mon Sep 17 00:00:00 2001 +From 711f4a49fa7d4c471cd905870fecaa6f83156d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 11 Jun 2024 11:52:33 +0200 -Subject: [PATCH 2/4] Configure a custom logout success handler for yunohost +Subject: [PATCH 2/3] Configure a custom logout success handler for yunohost ldap --- app/config/security.yml | 2 +- - app/config/services.yml | 4 +++ + app/config/services.yml | 3 +++ .../Security/LogoutSuccessHandler.php | 27 +++++++++++++++++++ - 3 files changed, 32 insertions(+), 1 deletion(-) + 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php diff --git a/app/config/security.yml b/app/config/security.yml -index 675d8905..876f4471 100644 +index f4ea3d47..de6b705b 100644 --- a/app/config/security.yml +++ b/app/config/security.yml -@@ -63,7 +63,7 @@ security: +@@ -64,7 +64,7 @@ security: logout: path: /logout @@ -25,20 +25,16 @@ index 675d8905..876f4471 100644 two_factor: provider: fos_userbundle diff --git a/app/config/services.yml b/app/config/services.yml -index efdd34d5..584b63c6 100644 +index c67341e8..7057ca42 100644 --- a/app/config/services.yml +++ b/app/config/services.yml -@@ -176,6 +176,10 @@ services: - tags: - - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - +@@ -401,3 +401,6 @@ services: + Symfony\Component\Ldap\Adapter\ExtLdap\Adapter: + arguments: + - host: localhost ++ + yunohost.logout_success_handler: + class: Wallabag\YunoHostBundle\Security\LogoutSuccessHandler -+ -+ - yunohost.ldap: - class: Symfony\Component\Ldap\LdapClient - arguments: ["localhost"] diff --git a/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php new file mode 100644 index 00000000..b3268243 diff --git a/sources/patches/main-02-oauth-workaround.patch b/sources/patches/main-02-oauth-workaround.patch index 20c5476..747030f 100644 --- a/sources/patches/main-02-oauth-workaround.patch +++ b/sources/patches/main-02-oauth-workaround.patch @@ -1,7 +1,7 @@ -From 7dc04c8bc50149998aa03a31f31674535a98ada9 Mon Sep 17 00:00:00 2001 +From 85c26ff4df2191bf3494491f27e2922aa6b569c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 11 Jun 2024 11:54:25 +0200 -Subject: [PATCH 4/4] OAuthStorage workaround +Subject: [PATCH 3/3] OAuthStorage workaround --- .../oauth-server-bundle/Storage/OAuthStorage.php | 2 +- From 227fe182ce4099f687358f4073943c482d8073c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 17 Jun 2024 19:39:20 +0200 Subject: [PATCH 13/24] set composer version --- scripts/_common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7760641..f7e4978 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,6 +4,8 @@ # COMMON VARIABLES #================================================= +YNH_COMPOSER_VERSION="2.1.1" + wb_conf="$install_dir/app/config/parameters.yml" #================================================= From b910d8b57dd17f0c32e06e69685297a3afa13abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 17 Jun 2024 19:49:14 +0200 Subject: [PATCH 14/24] set composer version --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index f7e4978..d4b78fb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_COMPOSER_VERSION="2.1.1" +YNH_COMPOSER_VERSION="2.7" wb_conf="$install_dir/app/config/parameters.yml" From f79bba08b6e725f68de44b5336de7312ff25d94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 17 Jun 2024 19:52:24 +0200 Subject: [PATCH 15/24] set composer version --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index d4b78fb..1cb5feb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_COMPOSER_VERSION="2.7" +YNH_COMPOSER_VERSION="2.7.7" wb_conf="$install_dir/app/config/parameters.yml" From 46f4536416166959049d1f6c010b0755c906d956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 17 Jun 2024 22:39:41 +0200 Subject: [PATCH 16/24] dry run composer install --- scripts/install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 5be8ea7..4366c54 100644 --- a/scripts/install +++ b/scripts/install @@ -40,8 +40,11 @@ fi #================================================= ynh_script_progression --message="Installing dependencies for LDAP..." --weight=1 -ynh_install_composer +# Some trick to actually not run composer install… +ynh_install_composer --install_args="--dry-run" ynh_composer_exec --workdir="$install_dir/sources" --commands="require symfony/ldap" +SYMFONY_ENV=prod ynh_composer_exec --commands="install --no-dev $install_args" \ + chown -R "$app:www-data" "$install_dir" #================================================= From 002ad3b791682a4ca73b575b7f37fac053561cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 17 Jun 2024 22:41:42 +0200 Subject: [PATCH 17/24] fix composer require --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4366c54..3d7a4fe 100644 --- a/scripts/install +++ b/scripts/install @@ -42,7 +42,7 @@ ynh_script_progression --message="Installing dependencies for LDAP..." --weight= # Some trick to actually not run composer install… ynh_install_composer --install_args="--dry-run" -ynh_composer_exec --workdir="$install_dir/sources" --commands="require symfony/ldap" +ynh_composer_exec --commands="require symfony/ldap" SYMFONY_ENV=prod ynh_composer_exec --commands="install --no-dev $install_args" \ chown -R "$app:www-data" "$install_dir" From 877c74deaac84ef9f655d71ddb1fe97dd477651d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 17 Jun 2024 22:44:48 +0200 Subject: [PATCH 18/24] do not composer install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3d7a4fe..90c965d 100644 --- a/scripts/install +++ b/scripts/install @@ -43,7 +43,7 @@ ynh_script_progression --message="Installing dependencies for LDAP..." --weight= # Some trick to actually not run composer install… ynh_install_composer --install_args="--dry-run" ynh_composer_exec --commands="require symfony/ldap" -SYMFONY_ENV=prod ynh_composer_exec --commands="install --no-dev $install_args" \ +# SYMFONY_ENV=prod ynh_composer_exec --commands="install --no-dev" chown -R "$app:www-data" "$install_dir" From 1c1ad4a91f3671164420cb2cf1080deb9bca1cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 20 Jul 2024 15:57:31 +0200 Subject: [PATCH 19/24] Update _common.sh --- scripts/_common.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1cb5feb..ae6eb5a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,6 +8,12 @@ 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 #================================================= From cc97b98d841ba8ad8e06d1b97668a992c6ff175f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 20 Jul 2024 15:58:35 +0200 Subject: [PATCH 20/24] Update install --- scripts/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 8a16ab5..e38a5c8 100644 --- a/scripts/install +++ b/scripts/install @@ -52,9 +52,7 @@ chown -R "$app:www-data" "$install_dir" #================================================= ynh_script_progression --message="Adding $app's configuration files..." --weight=1 -ynh_add_config --template="parameters.yml" --destination="$wb_conf" -chmod 600 "$wb_conf" -chown "$app:www-data" "$wb_conf" +ynh_add_config --template="parameters.yml" --destination="$install_dir/app/config/parameters.yml" chmod 600 "$install_dir/app/config/parameters.yml" chown "$app:$app" "$install_dir/app/config/parameters.yml" From dea25f07ef04b947923ad92792972d4b5418011f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 20 Jul 2024 16:00:27 +0200 Subject: [PATCH 21/24] Update upgrade --- scripts/upgrade | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 393aeea..79a07a1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -45,13 +45,10 @@ fi #================================================= ynh_script_progression --message="Reconfiguring $app..." --weight=1 -# Copy and set Wallabag dist configuration -ynh_add_config --template="parameters.yml" --destination="$wb_conf" -chmod 600 "$wb_conf" -chown "$app:www-data" "$wb_conf" +ynh_add_config --template="parameters.yml" --destination="$install_dir/app/config/parameters.yml" -# 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" # Upgrade database and clear the cache php_exec doctrine:migrations:migrate From 3197d05c7a3c4363102117b6f3f99dc8c67c40a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 20 Jul 2024 16:00:54 +0200 Subject: [PATCH 22/24] Update _common.sh --- scripts/_common.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 90726c2..89026c8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,12 +12,6 @@ php_exec() { php${phpversion} "$install_dir/bin/console" --no-interaction --env=prod "$@") } -# 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 #================================================= From 0fac2d07bad5762eccf0809463cc705909759e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 20 Jul 2024 19:30:53 +0200 Subject: [PATCH 23/24] Update upgrade --- scripts/upgrade | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 79a07a1..e089ecf 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,6 +40,18 @@ if [ -e "$install_dir/var/cache/prod/appProdProjectContainer.php" ]; then chmod 700 "$install_dir/var/cache/prod/appProdProjectContainer.php" fi +#================================================= +# INSTALL SYMFONY LDAP +#================================================= +ynh_script_progression --message="Installing dependencies for LDAP..." --weight=1 + +# Some trick to actually not run composer install… +ynh_install_composer --install_args="--dry-run" +ynh_composer_exec --commands="require symfony/ldap" +# SYMFONY_ENV=prod ynh_composer_exec --commands="install --no-dev" + +chown -R "$app:www-data" "$install_dir" + #================================================= # UPDATE A CONFIG FILE #================================================= From 8cb14eb5a1d07cb9ce158730a846228c9f74fd6d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 20 Sep 2024 06:38:10 +0000 Subject: [PATCH 24/24] Auto-update READMEs --- README_id.md | 2 +- README_nl.md | 2 +- README_ru.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README_id.md b/README_id.md index 1dd1cec..fd7a157 100644 --- a/README_id.md +++ b/README_id.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Versi terkirim:** 2.5.4~ynh7 +**Versi terkirim:** 2.6.9~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index fe579f1..e3a4a3b 100644 --- a/README_nl.md +++ b/README_nl.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Geleverde versie:** 2.5.4~ynh7 +**Geleverde versie:** 2.6.9~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index a000145..8bda273 100644 --- a/README_ru.md +++ b/README_ru.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Поставляемая версия:** 2.5.4~ynh7 +**Поставляемая версия:** 2.6.9~ynh1 **Демо-версия:**