From b46a4c806b844ccf0cd640885171870b5361845e Mon Sep 17 00:00:00 2001
From: Simon Mellerin <simon.mellerin@makina-corpus.com>
Date: Thu, 18 Feb 2021 10:21:28 +0100
Subject: [PATCH 1/2] Bump to aeneria 1.1.3 and fix #6

---
 README.md       | 2 +-
 conf/app.src    | 4 ++--
 manifest.json   | 2 +-
 scripts/upgrade | 7 +++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b152fec..c07ceff 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The idea of [æneria](https://aeneria.com) is to display energy consumption and
  * Better understand our own energy consumption
  * Analyse energy consumption throw weather data
 
- **Shipped version:** 1.1.2
+ **Shipped version:** 1.1.3
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index 57768d5..c686767 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://statics.aeneria.com/aeneria-app-1.1.2.tar.gz
-SOURCE_SUM=d9ea2a79e434297dd5a7d60774a29b64c56ea70de3bc655c5a5e654bd11e13a5
+SOURCE_URL=https://statics.aeneria.com/aeneria-app-1.1.3.tar.gz
+SOURCE_SUM=50194f003c1fcbf605875464a25f27ed1a439ce09fd0404ce400ae96e8e76d9f
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 9071826..77e0b12 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "A little dashboard to analyse your energy consumption data from Linky & weather",
         "fr": "Un petit tableau de bord pour analyser votre consomation d'énergie à partir des données d'un Linky et de la météo"
     },
-    "version": "1.1.2~ynh1",
+    "version": "1.1.3~ynh1",
     "url": "https://gitlab.com/aeneria/aeneria-app",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
diff --git a/scripts/upgrade b/scripts/upgrade
index 7e4d983..e9ef9c9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -85,7 +85,7 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# For aeneria source update, we use a temporary directory because
-	# without it, patche can't be apply correctly:
+	# without it, patches can't be apply correctly:
 	# In 'app-00-ldap-auth.patch' we create a new file, if we try
 	# to apply the patch a second time while the file already exists, it
 	# throws a warning leading to an upgrade fail.
@@ -180,7 +180,10 @@ pushd $final_path
 
   # Set admin user
   mail=$(ynh_user_get_info --username=$admin --key='mail')
-  ynh_exec_as $app php$phpversion bin/console aeneria:user:grant "$mail"
+  ynh_exec_as $app php$phpversion bin/console aeneria:user:grant "$mail" -n
+
+  # Regenerate RSA keys
+  ynh_exec_as $app php$phpversion bin/console aeneria:generate-key --force -n
 popd
 
 #=================================================

From 697a36fe84e2bc2cb8203ad71b0c040a9b1a6a41 Mon Sep 17 00:00:00 2001
From: Simon Mellerin <simon.mellerin@makina-corpus.com>
Date: Thu, 18 Feb 2021 12:45:41 +0100
Subject: [PATCH 2/2] Fix check process

---
 check_process | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index d0ff635..862aebb 100644
--- a/check_process
+++ b/check_process
@@ -13,7 +13,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=25bf428e280f463fb85c3f8332b523415c56f816
+		upgrade=1	from_commit=45f0c70e9d96fa522cac82a210968a3e6379dd53
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=1
@@ -25,5 +25,5 @@
 Email=
 Notification=change
 ;;; Upgrade options
-	; commit=25bf428e280f463fb85c3f8332b523415c56f816
-		name=1.0.3
+	; commit=45f0c70e9d96fa522cac82a210968a3e6379dd53
+		name=1.1.2