From 77e3fcd9621f040268134e45641c99acf749427b Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 11 Oct 2019 22:25:41 +0200
Subject: [PATCH] Upgrade to 1.11.0

---
 README.md             |  2 +-
 conf/app.src          |  4 ++--
 conf/bitwarden_rs.env | 17 +++++++++++++++--
 conf/web.src          |  4 ++--
 manifest.json         |  2 +-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e6525f7..9ef0c6b 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Open source password management solutions.
 
-**Shipped version:** 1.9.1
+**Shipped version:** 1.11.0
 
 ## Important points to read before installing
 
diff --git a/conf/app.src b/conf/app.src
index 74574fd..0972be2 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/dani-garcia/bitwarden_rs/archive/1.9.1.tar.gz
-SOURCE_SUM=33e50d2ba6db866caf7e9d1b87064523c790a2a6b7c6c2eb802702b20afa853a
+SOURCE_URL=https://github.com/dani-garcia/bitwarden_rs/archive/1.11.0.tar.gz
+SOURCE_SUM=d2d8260e020c373f5d2fd9902af490b43beb840e050065003443057ac833707f
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/bitwarden_rs.env b/conf/bitwarden_rs.env
index 7b2c125..c0057ce 100644
--- a/conf/bitwarden_rs.env
+++ b/conf/bitwarden_rs.env
@@ -4,8 +4,13 @@
 ## Main data folder
 # DATA_FOLDER=data
 
-## Individual folders, these override %DATA_FOLDER%
+## Database URL
+## When using SQLite, this is the path to the DB file, default to %DATA_FOLDER%/db.sqlite3
+## When using MySQL, this it is the URL to the DB, including username and password:
+## Format: mysql://[user[:password]@]host/database_name
 # DATABASE_URL=data/db.sqlite3
+
+## Individual folders, these override %DATA_FOLDER%
 # RSA_KEY_FILENAME=data/rsa_key
 # ICON_CACHE_FOLDER=data/icon_cache
 # ATTACHMENTS_FOLDER=data/attachments
@@ -78,6 +83,10 @@ LOG_FILE=/var/log/__APP__/__APP__.log
 ## Useful to hide other servers in the local network. Check the WIKI for more details
 # ICON_BLACKLIST_REGEX=192\.168\.1\.[0-9].*^
 
+## Any IP which is not defined as a global IP will be blacklisted.
+## Usefull to secure your internal environment: See https://en.wikipedia.org/wiki/Reserved_IP_addresses for a list of IPs which it will block
+# ICON_BLACKLIST_NON_GLOBAL_IPS=true
+
 ## Disable 2FA remember
 ## Enabling this would force the users to use a second factor to login every time.
 ## Note that the checkbox would still be present, but ignored.
@@ -90,6 +99,9 @@ SIGNUPS_ALLOWED=false
 ## One option is to use 'openssl rand -base64 48'
 ## If not set, the admin panel is disabled
 ADMIN_TOKEN=__ADMIN_TOKEN__
+
+## Enable this to bypass the admin panel security. This option is only
+## meant to be used with the use of a separate auth layer in front
 # DISABLE_ADMIN_TOKEN=false
 
 ## Invitations org admins to invite users, even when signups are disabled
@@ -143,4 +155,5 @@ SMTP_FROM_NAME=Bitwarden_RS
 SMTP_PORT=25
 SMTP_SSL=false
 # SMTP_USERNAME=username
-# SMTP_PASSWORD=password
\ No newline at end of file
+# SMTP_PASSWORD=password
+# SMTP_AUTH_MECHANISM="Plain"
diff --git a/conf/web.src b/conf/web.src
index 5bcd38b..831a7ca 100644
--- a/conf/web.src
+++ b/conf/web.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/dani-garcia/bw_web_builds/releases/download/v2.10.1/bw_web_v2.10.1.tar.gz
-SOURCE_SUM=0bfedc69420dc87a30a1673d5b944f00e341160e724485ef47ab9ed835ed6fab
+SOURCE_URL=https://github.com/dani-garcia/bw_web_builds/releases/download/v2.12.0/bw_web_v2.12.0.tar.gz
+SOURCE_SUM=3664d4368fbb35abc08480d24a3800fae4caa1fe3e0fd06f7ec7584cafeb8d18
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/manifest.json b/manifest.json
index fbae72b..af8a927 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open source password management solutions.",
         "fr": "Solutions de gestion de mots de passe open source."
     },
-    "version": "1.9.1~ynh3",
+    "version": "1.11.0~ynh1",
     "url": "https://github.com/dani-garcia/bitwarden_rs",
     "license": "GPL-3.0-or-later",
     "maintainer": {