diff --git a/README.md b/README.md index 7f6c23e..45e8724 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Wallabag v2 for Yunohost **This is a work-in-progress Wallabag v2 package for YunoHost.** -**Shipped version:** 2.0.8 +**Shipped version:** 2.1.1 [Wallabag](https://www.wallabag.org/) is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It @@ -18,6 +18,7 @@ this package: * Integrate with YunoHost users and SSO - i.e. logout button * Allow one user to be the administrator (set at the installation) + * Asynchronous import using Redis (need to be enabled in the *Internal Settings*) ## TODO diff --git a/conf/parameters.yml b/conf/parameters.yml index ad84ef0..c0637fe 100644 --- a/conf/parameters.yml +++ b/conf/parameters.yml @@ -23,6 +23,19 @@ parameters: twofactor_sender: no-reply@wallabag.org # fosuser stuff + fosuser_registration: false fosuser_confirmation: true from_email: no-reply@wallabag.org + + rss_limit: 50 + + # RabbitMQ processing + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + + # Redis processing + redis_host: localhost + redis_port: 6379 diff --git a/conf/wallabag-deps.control b/conf/wallabag-deps.control index e48b483..203e0d8 100644 --- a/conf/wallabag-deps.control +++ b/conf/wallabag-deps.control @@ -4,9 +4,9 @@ Homepage: https://www.wallabag.org/ Standards-Version: 3.9.2 Package: wallabag-deps -Version: 2.0-1 +Version: 2.1-1 Depends: php5-cli, php5-mysql, php5-json, php5-gd, php5-tidy, php5-curl - , php-gettext + , php-gettext, redis-server Architecture: all Description: meta package for wallabag dependencies Wallabag is a self hostable application allowing you to not miss diff --git a/manifest.json b/manifest.json index 9f74960..15a5694 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "url": "https://www.wallabag.org", "license": "MIT", - "version": "2.0.8", + "version": "2.1.1", "maintainer": { "name": "jerome", "email": "jerome@yunohost.org" diff --git a/scripts/_common.sh b/scripts/_common.sh index c8a775b..798a918 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,7 @@ # # Wallabag version -VERSION="2.0.8" +VERSION="2.1.1" # Package name for Wallabag dependencies DEPS_PKG_NAME="wallabag-deps" @@ -12,7 +12,7 @@ DEPS_PKG_NAME="wallabag-deps" WALLABAG_SOURCE_URL="https://framabag.org/wallabag-release-${VERSION}.tar.gz" # Full Wallabag sources tarball checksum -WALLABAG_SOURCE_SHA256="885567b000ad3ea554bb00cbc3d5efdd121854a5b8114f7e31de6bf8d49e7768" +WALLABAG_SOURCE_SHA256="59649f777932cd5a0cbc950c57fffbee851cc4222dda5ecbb462900a6e2a7ef2" # App package root directory should be the parent folder PKGDIR=$(cd ../; pwd) diff --git a/scripts/upgrade b/scripts/upgrade index 7b65e01..be8a062 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -45,7 +45,8 @@ sudo rm -rf "$DESTDIR" sudo mv "$TMPDIR" "$DESTDIR" sudo chown -R www-data: "$DESTDIR" -# Clear Wallabag cache +# Upgrade database and clear the cache +exec_console www-data "$DESTDIR" doctrine:migrations:migrate exec_console www-data "$DESTDIR" cache:clear # Copy and set nginx configuration