From 16340deabeac6cd5809320d1ab54d32af17d0312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Sun, 20 Nov 2016 19:50:41 +0100
Subject: [PATCH] [enh] Update Wallabag to v2.1.4

---
 README.md           |  2 +-
 conf/nginx.conf     | 46 ++++++++++++++++++++++++++-------------------
 conf/parameters.yml |  3 +++
 manifest.json       |  2 +-
 scripts/_common.sh  |  4 ++--
 5 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 45e8724..a7e6340 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.1.1
+**Shipped version:** 2.1.4
 
 [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
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 139aac6..ef7725c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,24 +1,32 @@
 location {LOCATION} {
-    alias {DESTDIR}/web/;
-    if ($scheme = http) {
-        rewrite ^ https://$server_name$request_uri? permanent;
-    }
-    index app.php;
-    try_files $uri @wallabag;
-    location ~ ^{PATH}/app\.php(?:$|/) {
-        include fastcgi_params;
-        fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-        fastcgi_param REMOTE_USER     $remote_user;
-        fastcgi_param PATH_INFO       $fastcgi_path_info;
-        fastcgi_param SCRIPT_FILENAME $request_filename;
-        fastcgi_pass unix:/var/run/php5-fpm-{POOLNAME}.sock;
-        fastcgi_intercept_errors on;
-    }
+  alias {DESTDIR}/web/;
 
-    # Include SSOWAT user panel.
-    include conf.d/yunohost_panel.conf.inc;
+  if ($scheme = http) {
+    rewrite ^ https://$server_name$request_uri? permanent;
+  }
+
+  try_files $uri @wallbag2;
+
+  location ~ ^{PATH}/app\.php(?:$|/) {
+    include fastcgi_params;
+    fastcgi_split_path_info ^(.+\.php)(/.*)$;
+    fastcgi_param SCRIPT_FILENAME $request_filename;
+    fastcgi_param PATH_INFO       $fastcgi_path_info;
+    fastcgi_param REMOTE_USER     $remote_user;
+    fastcgi_pass unix:/var/run/php5-fpm-{POOLNAME}.sock;
+    fastcgi_intercept_errors on;
+  }
+
+  # return 404 for all other php files not matching the front controller
+  # this prevents access to other php files you don't want to be accessible.
+  location ~ \.php$ {
+    return 404;
+  }
+
+  # Include SSOWAT user panel.
+  include conf.d/yunohost_panel.conf.inc;
 }
 
-location @wallabag {
-    rewrite ^ {PATH}/app.php?$request_uri;
+location @wallbag2 {
+  rewrite ^ {PATH}/app.php$is_args$args;
 }
diff --git a/conf/parameters.yml b/conf/parameters.yml
index c0637fe..7f8c4c9 100644
--- a/conf/parameters.yml
+++ b/conf/parameters.yml
@@ -7,6 +7,7 @@ parameters:
     database_password: {DBPASS}
     database_path: null
     database_table_prefix: null
+    database_socket: null
 
     mailer_transport:  smtp
     mailer_host:       127.0.0.1
@@ -37,5 +38,7 @@ parameters:
     rabbitmq_password: guest
 
     # Redis processing
+    redis_scheme: tcp
     redis_host: localhost
     redis_port: 6379
+    redis_path: null
diff --git a/manifest.json b/manifest.json
index 15a5694..dfb0742 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
     },
     "url": "https://www.wallabag.org",
     "license": "MIT",
-    "version": "2.1.1",
+    "version": "2.1.4",
     "maintainer": {
         "name": "jerome",
         "email": "jerome@yunohost.org"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 798a918..4981226 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,7 +3,7 @@
 #
 
 # Wallabag version
-VERSION="2.1.1"
+VERSION="2.1.4"
 
 # 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="59649f777932cd5a0cbc950c57fffbee851cc4222dda5ecbb462900a6e2a7ef2"
+WALLABAG_SOURCE_SHA256="eb64205a4d7c161527edd08bed22e8dd9799fe8a4130c5964c18cba3a94c9768"
 
 # App package root directory should be the parent folder
 PKGDIR=$(cd ../; pwd)