From bae9d48deafa7a1714b9774b2629364465714bee Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Mon, 11 Dec 2017 23:09:49 +0100
Subject: [PATCH 01/12] Update source to 2.3

---
 conf/app.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index bc60087..ed74b9c 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.2.3.tar.gz
-SOURCE_SUM=13fe5cb7cfc741abee08312f0055e9549e60590daff2fac41be5266f7956d857
+SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.0.tar.gz
+SOURCE_SUM=9726b17a3cff73a0f2d7acfa08cb5d4abe8b2b07992f9a763f62868225108c20
 SOURCE_FORMAT=tar.gz

From 54b99818fee7a33f3334f8bf024e00f1a0cb1bf0 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Mon, 11 Dec 2017 23:18:01 +0100
Subject: [PATCH 02/12] Update version to 2.3

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 6f14933..325e65a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
     },
     "url": "https://www.wallabag.org",
     "license": "MIT",
-    "version": "2.2.3",
+    "version": "2.3.0",
     "maintainer": {
         "name": "lapineige",
         "email": ""

From 993f47e081324630dc5cf7cdf7c445a91ce4ac25 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Mon, 11 Dec 2017 23:19:11 +0100
Subject: [PATCH 03/12] Update readme version to 2.3

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a76a1cf..b11ac3c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This is a Wallabag v2 package for YunoHost.
 
 **NB: Since @jeromelebleu is no longer maintaining this package, I (@lapineige) take over this repository. But I have limited time and experience, so feel free to help !**
 
-**Shipped version:** 2.2.3
+**Shipped version:** 2.3.0
 
 [Wallabag](https://www.wallabag.org/) is a self hostable Read-It-Later application allowing
 you to not miss any content anymore. Click, save, read it when you can.
@@ -56,7 +56,7 @@ Paquet Wallabag v2 pour Yunohost.
 
 **NB: Depuis que @jeromelebleu ne maintiens plus ce paquet, je (@lapineige) reprends la charge de ce dépôt. Mais j'ai un temps et une expérience limitées, donc n'hésitez pas à donner un coup de main :) !**
 
-**Version actuelle:** 2.2.3
+**Version actuelle:** 2.3.0
 
 [Wallabag](https://www.wallabag.org/) est une application de lecture différée : elle  permet simplement d’archiver une page web en ne conservant que le contenu. Les éléments superflus (menus, publicités, etc.) sont supprimés.
 

From 37402611f886f2d36a2edc544e2c535e6d18ce30 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 13 Dec 2017 21:53:40 +0100
Subject: [PATCH 04/12] Adapt existing patches to 2.3

---
 sources/patches/app-00-ldap-auth.patch        | 19 +++++++++++--------
 .../app-01-logout-success-handler.patch       |  5 +++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sources/patches/app-00-ldap-auth.patch b/sources/patches/app-00-ldap-auth.patch
index f458191..5742009 100644
--- a/sources/patches/app-00-ldap-auth.patch
+++ b/sources/patches/app-00-ldap-auth.patch
@@ -1,17 +1,20 @@
 --- a/app/config/services.yml	2016-05-25 18:09:56.374914445 +0200
 +++ b/app/config/services.yml	2016-05-25 18:07:38.775042951 +0200
-@@ -36,3 +36,7 @@
-         arguments: ["@session"]
+@@ -43,6 +43,10 @@
          tags:
              - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
-+
+
 +    yunohost.ldap:
 +        class: Symfony\Component\Ldap\LdapClient
 +        arguments: ["localhost"]
++
+     craue_config_cache_provider:
+         class: Symfony\Component\Cache\Adapter\FilesystemAdapter
+         public: false
 --- a/app/config/security.yml	2016-05-25 18:09:46.814645164 +0200
 +++ b/app/config/security.yml	2016-05-25 18:07:38.775042951 +0200
-@@ -11,6 +11,14 @@
-             entity: { class: WallabagUserBundle:User, property: username }
+@@ -13,6 +13,14 @@
+                 property: username
          fos_userbundle:
              id: fos_user.user_provider.username
 +        yunohost_users:
@@ -22,11 +25,11 @@
 +                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
-@@ -36,6 +44,9 @@
- 
+@@ -38,6 +46,9 @@
+
          secured_area:
              pattern: ^/
 +            http_basic_ldap:
diff --git a/sources/patches/app-01-logout-success-handler.patch b/sources/patches/app-01-logout-success-handler.patch
index a3e75fc..0074cad 100644
--- a/sources/patches/app-01-logout-success-handler.patch
+++ b/sources/patches/app-01-logout-success-handler.patch
@@ -15,12 +15,13 @@ diff --git a/app/config/services.yml b/app/config/services.yml
 index 8a09fde..ee63e06 100644
 --- a/app/config/services.yml
 +++ b/app/config/services.yml
-@@ -37,6 +37,9 @@ services:
+@@ -43,6 +43,9 @@
          tags:
              - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
- 
+
 +    yunohost.logout_success_handler:
 +        class: Wallabag\YunoHostBundle\Security\LogoutSuccessHandler
++
 +
      yunohost.ldap:
          class: Symfony\Component\Ldap\LdapClient

From c05c1504f5096e822e126d5ff99254a92c700eb6 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 13 Dec 2017 21:54:22 +0100
Subject: [PATCH 05/12] Remove need to manage parameters.yml file; adapt to
 version 2.3

---
 conf/parameters.yml | 50 ---------------------------------------------
 scripts/install     | 15 +++++++++-----
 scripts/upgrade     | 14 ++++++++-----
 3 files changed, 19 insertions(+), 60 deletions(-)
 delete mode 100644 conf/parameters.yml

diff --git a/conf/parameters.yml b/conf/parameters.yml
deleted file mode 100644
index 1acb3a7..0000000
--- a/conf/parameters.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-parameters:
-    database_driver: pdo_mysql
-    database_host: localhost
-    database_port: 3306
-    database_name: {DBNAME}
-    database_user: {DBUSER}
-    database_password: {DBPASS}
-    database_path: null
-    database_table_prefix: null
-    database_socket: null
-    database_charset: utf8mb4
-
-    mailer_transport:  smtp
-    mailer_host:       localhost
-    mailer_user:       null
-    mailer_password:   null
-
-    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
-
-    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
- 
-    # sites credentials
-    sites_credentials: {}
diff --git a/scripts/install b/scripts/install
index d738015..3cb3255 100644
--- a/scripts/install
+++ b/scripts/install
@@ -86,11 +86,16 @@ ynh_system_user_create $app	# Create a dedicated system user
 
 # Copy and set Wallabag dist configuration
 wb_conf="${TMPDIR}/app/config/parameters.yml"
-cp ../conf/parameters.yml "$wb_conf"
-ynh_replace_string "{DBNAME}" "${db_name}" "$wb_conf"
-ynh_replace_string "{DBUSER}" "${db_user}" "$wb_conf"
-ynh_replace_string "{DBPASS}" "${db_pwd}" "$wb_conf"
-ynh_replace_string "{DESKEY}" "${deskey}" "$wb_conf"
+cp ${TMPDIR}/app/config/parameters.yml.dist $wb_conf
+
+ynh_replace_string "fosuser_registration: true" "fosuser_registration: false" "$wb_conf"
+ynh_replace_string "database_name: wallabag" "database_name:  ${db_name}" "$wb_conf"
+ynh_replace_string "database_user: root" "database_user: ${db_user}" "$wb_conf"
+ynh_replace_string "database_password: ~" "database_password: ${db_pwd}" "$wb_conf"
+ynh_replace_string "database_table_prefix: wallabag_" "database_table_prefix: null" "$wb_conf"
+ynh_replace_string "secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv" "secret: ${deskey}" "$wb_conf"
+ynh_replace_string "domain_name: https://your-wallabag-url-instance.com" "domain_name: https://$domain$path_url" "$wb_conf"
+
 # Restrict rights to Wallabag user only
 chmod 600 "$wb_conf"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index e6e98d7..2739478 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -89,11 +89,15 @@ ynh_system_user_create $app # Create dedicated user if not existing
 
 # Copy and set Wallabag dist configuration
 wb_conf="${TMPDIR}/app/config/parameters.yml"
-cp ../conf/parameters.yml "$wb_conf"
-ynh_replace_string "{DBNAME}" "${db_name}" "$wb_conf"
-ynh_replace_string "{DBUSER}" "${db_user}" "$wb_conf"
-ynh_replace_string "{DBPASS}" "${db_pwd}" "$wb_conf"
-ynh_replace_string "{DESKEY}" "${deskey}" "$wb_conf"
+cp ${TMPDIR}/app/config/parameters.yml.dist $wb_conf
+
+ynh_replace_string "fosuser_registration: true" "fosuser_registration: false" "$wb_conf"
+ynh_replace_string "database_name: wallabag" "database_name:  ${db_name}" "$wb_conf"
+ynh_replace_string "database_user: root" "database_user: ${db_user}" "$wb_conf"
+ynh_replace_string "database_password: ~" "database_password: ${db_pwd}" "$wb_conf"
+ynh_replace_string "database_table_prefix: wallabag_" "database_table_prefix: null" "$wb_conf"
+ynh_replace_string "secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv" "secret: ${deskey}" "$wb_conf"
+ynh_replace_string "domain_name: https://your-wallabag-url-instance.com" "domain_name: https://$domain$path_url" "$wb_conf"
 
 # Replace files and set permissions
 ynh_secure_remove "${final_path}/var/cache"

From 5b318089a1af956cd6b685a288d5fe6ba5a24b97 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 14 Dec 2017 10:20:32 +0100
Subject: [PATCH 06/12] Fix php5-redis dependency (redis-server is installed by
 YunoHost)

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 0a1e55b..5e0e79a 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,7 +3,7 @@
 #
 
 # Package dependencies
-PKG_DEPENDENCIES="php5-cli php5-mysql php5-json php5-gd php5-tidy php5-curl php-gettext redis-server"
+PKG_DEPENDENCIES="php5-cli php5-mysql php5-json php5-gd php5-tidy php5-curl php-gettext php5-redis"
 
 # Execute a command as another user
 # usage: exec_as USER COMMAND [ARG ...]

From e77c42fa82e9858dcd22530e27c2893e4b605d89 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 16 Dec 2017 17:03:42 +0100
Subject: [PATCH 07/12] Manage new domain_name parameter in change_url

---
 scripts/change_url | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index 1a2bb6e..42dc935 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -28,6 +28,7 @@ app=$YNH_APP_INSTANCE_NAME
 db_name=$(ynh_app_setting_get "$app" db_name)
 db_pwd=$(ynh_app_setting_get "$app" mysqlpwd)
 db_user="$db_name"
+final_path=$(ynh_app_setting_get "$app" final_path)
 
 #=================================================
 # CHECK PATHS SYNTAX
@@ -76,7 +77,7 @@ then
     
     # Move #for-subdir comment at the beginning of the line (line not needed for "/" path)
     ynh_replace_string "\(.*\) #for-subdir" "#for-subdir \1" "$nginx_conf_path"
-    elif [ "$new_path" != "/" ] && [ "$old_path" = "/" ] ; then
+  elif [ "$new_path" != "/" ] && [ "$old_path" = "/" ] ; then
     # Move #for-subdir comment at the end of the line (line needed for "/path" path)
     ynh_replace_string "#for-subdir\(.*\)" "\1 #for-subdir" "$nginx_conf_path"
     
@@ -87,7 +88,7 @@ then
     ynh_replace_string "rewrite ^ /" "rewrite ^ $new_path/" "$nginx_conf_path"
   else
     # Replace locations starting with old_path
-    # Look for every possible patterns for location directive(see https://nginx.org/en/docs/http/ngx_http_core_module.html#location)
+    # Look for every possible patterns for location directive (see https://nginx.org/en/docs/http/ngx_http_core_module.html#location)
     ynh_replace_string "location\( \(=\|~\|~\*\|\^~\)\)\? \(\^\)\?$old_path" "location\1 \3$new_path" "$nginx_conf_path"
     # Replace path in "rewrite" directive
     ynh_replace_string "rewrite ^ $old_path" "rewrite ^ $new_path" "$nginx_conf_path"
@@ -113,6 +114,9 @@ fi
 # Configure Wallabag instance URL
 ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_user"  <<< "UPDATE craue_config_setting SET value = 'https://$new_domain$new_path' WHERE name = 'wallabag_url'"
 
+# Change domain name in parameters.yml
+ynh_replace_string "domain_name: https://$old_domain$old_path" "domain_name: https://$new_domain$new_path" $final_path/app/config/parameters.yml
+
 # If "Download images locally" option has been enabled in Internal Settings
 download_images_enabled=$(ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_user"  <<<  "SELECT value from craue_config_setting WHERE name='download_images_enabled '" | tail -n 1)
 if [ "$download_images_enabled" = "1" ] ; then

From 0598867b5915694236cce7e8b95a3db88963bbf8 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 27 Dec 2017 11:38:43 +0100
Subject: [PATCH 08/12] Upgrade to upstream version 2.3.1

---
 README.md                                           | 2 +-
 conf/app.src                                        | 4 ++--
 manifest.json                                       | 2 +-
 scripts/_common.sh                                  | 6 ------
 sources/patches/app-01-logout-success-handler.patch | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index b11ac3c..51c3590 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This is a Wallabag v2 package for YunoHost.
 
 **NB: Since @jeromelebleu is no longer maintaining this package, I (@lapineige) take over this repository. But I have limited time and experience, so feel free to help !**
 
-**Shipped version:** 2.3.0
+**Shipped version:** 2.3.1
 
 [Wallabag](https://www.wallabag.org/) is a self hostable Read-It-Later application allowing
 you to not miss any content anymore. Click, save, read it when you can.
diff --git a/conf/app.src b/conf/app.src
index ed74b9c..336db3b 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.0.tar.gz
-SOURCE_SUM=9726b17a3cff73a0f2d7acfa08cb5d4abe8b2b07992f9a763f62868225108c20
+SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.1.tar.gz
+SOURCE_SUM=c459de5b6752e94ccd4165c75ec11ad3ce7f1cb73c2f2f2f53e89568599467e2
 SOURCE_FORMAT=tar.gz
diff --git a/manifest.json b/manifest.json
index 5cc6858..82e6f46 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
     },
     "url": "https://www.wallabag.org",
     "license": "MIT",
-    "version": "2.3.0",
+    "version": "2.3.1-1",
     "maintainer": {
         "name": "lapineige",
         "email": ""
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2a1cd6e..aa74003 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -36,12 +36,6 @@ QUIET () {	# redirect standard output to /dev/null
 	$@ > /dev/null
 }
 
-
-HUMAN_SIZE () {	# Transforms a Kb-based size to a human-readable size
-	human=$(numfmt --to=iec --from-unit=1K $1)
-	echo $human
-}
-
 CHECK_SIZE () {	# Check if enough disk space available on backup storage
 	file_to_analyse=$1
 	backup_size=$(du --summarize "$file_to_analyse" | cut -f1)
diff --git a/sources/patches/app-01-logout-success-handler.patch b/sources/patches/app-01-logout-success-handler.patch
index 0074cad..166643d 100644
--- a/sources/patches/app-01-logout-success-handler.patch
+++ b/sources/patches/app-01-logout-success-handler.patch
@@ -15,7 +15,7 @@ diff --git a/app/config/services.yml b/app/config/services.yml
 index 8a09fde..ee63e06 100644
 --- a/app/config/services.yml
 +++ b/app/config/services.yml
-@@ -43,6 +43,9 @@
+@@ -43,6 +43,10 @@
          tags:
              - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
 

From 98082952828d419ab13d360152b0c664c850df8b Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 24 Jan 2018 15:41:23 +0100
Subject: [PATCH 09/12] Upgrade to upstream version 2.3.2

---
 README.md     | 2 +-
 check_process | 3 ++-
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 51c3590..c57e535 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This is a Wallabag v2 package for YunoHost.
 
 **NB: Since @jeromelebleu is no longer maintaining this package, I (@lapineige) take over this repository. But I have limited time and experience, so feel free to help !**
 
-**Shipped version:** 2.3.1
+**Shipped version:** 2.3.2
 
 [Wallabag](https://www.wallabag.org/) is a self hostable Read-It-Later application allowing
 you to not miss any content anymore. Click, save, read it when you can.
diff --git a/check_process b/check_process
index 813d5d2..180e9dd 100644
--- a/check_process
+++ b/check_process
@@ -11,6 +11,7 @@
 		setup_private=0
 		setup_public=0
 		upgrade=1
+		upgrade=1 from_commit=f75d58cb32c51a0981333ea88974dc3199324e65
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=1
@@ -31,4 +32,4 @@
   Level 10=0
 ;;; Options
 Email=
-Notification=none
\ No newline at end of file
+Notification=none
diff --git a/conf/app.src b/conf/app.src
index 336db3b..9961d0e 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.1.tar.gz
-SOURCE_SUM=c459de5b6752e94ccd4165c75ec11ad3ce7f1cb73c2f2f2f53e89568599467e2
+SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.2.tar.gz
+SOURCE_SUM=047a49d48a1199bd1634cab76d4af3dba95096885d4f7814377210fa76fbcc9f
 SOURCE_FORMAT=tar.gz
diff --git a/manifest.json b/manifest.json
index 82e6f46..848621b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
     },
     "url": "https://www.wallabag.org",
     "license": "MIT",
-    "version": "2.3.1-1",
+    "version": "2.3.2-1",
     "maintainer": {
         "name": "lapineige",
         "email": ""

From 10b7f01db6a4daab63502311ca5ce667f344fb44 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 24 Jan 2018 15:41:39 +0100
Subject: [PATCH 10/12] Remove obsolete calls to checkurl

---
 scripts/_common.sh |  9 ---------
 scripts/install    | 10 ++++++++--
 scripts/restore    |  6 ++++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index aa74003..ffe8244 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -49,15 +49,6 @@ CHECK_SIZE () {	# Check if enough disk space available on backup storage
 	fi
 }
 
-CHECK_DOMAINPATH () {	# Check domain/path availability
-	yunohost app checkurl $domain$path_url -a $app
-}
-
-CHECK_FINALPATH () {	# Check if destination directory already exists
-	final_path="/var/www/$app"
-	test ! -e "$final_path" || ynh_die "This path already contains a folder"
-}
-
 
 # ============= FUTURE YUNOHOST HELPER =============
 # Delete a file checksum from the app settings
diff --git a/scripts/install b/scripts/install
index 83069e9..93fc374 100644
--- a/scripts/install
+++ b/scripts/install
@@ -31,9 +31,15 @@ admin=$YNH_APP_ARG_ADMIN
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
 
+final_path=/var/www/$app
+test ! -e "$final_path" || ynh_die "This path already contains a folder"
+
 path_url=$(ynh_normalize_url_path $path_url)	# Check and normalize path
-CHECK_DOMAINPATH	# Check domain and path availability
-CHECK_FINALPATH # Check if destination directory is not already in use
+
+# Check web path availability
+ynh_webpath_available $domain $path_url
+# Register (book) web path
+ynh_webpath_register $app $domain $path_url
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
diff --git a/scripts/restore b/scripts/restore
index 8058237..87b6412 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -31,8 +31,10 @@ db_name=$(ynh_app_setting_get $app db_name)
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
 
-CHECK_DOMAINPATH	# Check domain and path availability
-CHECK_FINALPATH # Check if destination directory is not already in use
+ynh_webpath_available $domain $path_url \
+	|| ynh_die "Path not available: ${domain}${path_url}"
+test ! -d $final_path \
+	|| ynh_die "There is already a directory: $final_path "
 
 #=================================================
 # INSTALL DEPENDENCIES

From d7876615040895825a698ea1e33b1046b79638a3 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 24 Jan 2018 16:25:56 +0100
Subject: [PATCH 11/12] Fix check_process for upgrade from previous commit

---
 check_process | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/check_process b/check_process
index 180e9dd..9e25221 100644
--- a/check_process
+++ b/check_process
@@ -33,3 +33,7 @@
 ;;; Options
 Email=
 Notification=none
+;;; Upgrade options
+	; commit=f75d58cb32c51a0981333ea88974dc3199324e65
+		name= Previous package version
+manifest_arg=domain=DOMAIN&path=PATH&admin=USER&

From e6b0b6b64c4544495f80f01cfba7e60f3f019a9d Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Sat, 27 Jan 2018 19:08:11 +0100
Subject: [PATCH 12/12] Fix Version number

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c57e535..38cf006 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Paquet Wallabag v2 pour Yunohost.
 
 **NB: Depuis que @jeromelebleu ne maintiens plus ce paquet, je (@lapineige) reprends la charge de ce dépôt. Mais j'ai un temps et une expérience limitées, donc n'hésitez pas à donner un coup de main :) !**
 
-**Version actuelle:** 2.3.0
+**Version actuelle:** 2.3.2
 
 [Wallabag](https://www.wallabag.org/) est une application de lecture différée : elle  permet simplement d’archiver une page web en ne conservant que le contenu. Les éléments superflus (menus, publicités, etc.) sont supprimés.