From d9e25cbd2e527f3501a1b7d104e7f93536c8204c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 28 Nov 2021 22:03:09 +0100
Subject: [PATCH] Testing (#125)

* 1.5.1
---
 README.md           | 2 +-
 README_fr.md        | 2 +-
 conf/app.src        | 4 ++--
 conf/config.inc.php | 2 --
 conf/nginx.conf     | 5 -----
 manifest.json       | 2 +-
 6 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 6c42e06..b498917 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ In addition to Roundcube core features, the following are made available with th
 * Support for PGP encryption with Enigma plugin by default.
 
 
-**Shipped version:** 1.5.0~ynh2
+**Shipped version:** 1.5.1~ynh1
 
 **Demo:** https://demo.yunohost.org/webmail/
 
diff --git a/README_fr.md b/README_fr.md
index 2718c39..e205090 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -24,7 +24,7 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s
 * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default.
 
 
-**Version incluse :** 1.5.0~ynh2
+**Version incluse :** 1.5.1~ynh1
 
 **Démo :** https://demo.yunohost.org/webmail/
 
diff --git a/conf/app.src b/conf/app.src
index 5274aea..d098dc7 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5.0/roundcubemail-1.5.0.tar.gz
-SOURCE_SUM=f204b412f930ef6af9832d9afa95640803b7b94c3028450b0f94f56cdc4bbe1d
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5.1/roundcubemail-1.5.1.tar.gz
+SOURCE_SUM=ad2e4b061035567a6d19ddbda5275b667e5bd1042b236e6d410a305c34569931
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/config.inc.php b/conf/config.inc.php
index 897e42c..930cdeb 100644
--- a/conf/config.inc.php
+++ b/conf/config.inc.php
@@ -94,8 +94,6 @@ $config['product_name'] = 'YunoHost Webmail';
 // YOUR KEY MUST BE DIFFERENT THAN THE SAMPLE VALUE FOR SECURITY REASONS
 $config['des_key'] = '__DESKEY__';
 
-// skin name: folder from skins/
-$config['skin'] = 'elastic';
 
 // ----------------------------------
 // USER INTERFACE
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7247307..7f4196e 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
   client_max_body_size 10G;
   try_files $uri $uri/ /index.php?q=$uri&$args;
diff --git a/manifest.json b/manifest.json
index ea1daed..dc680ba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.5.0~ynh2",
+    "version": "1.5.1~ynh1",
     "url": "https://roundcube.net/",
     "upstream": {
         "license": "GPL-3.0-only",