From 4df5375cbd970f51eb2e8a4d8fc78197bbcd29cd Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 12 Jan 2021 11:41:22 +0100 Subject: [PATCH 1/4] Cron job at 01:00 not every minute of the first hour --- conf/aeneria.cron | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/aeneria.cron b/conf/aeneria.cron index 1ae7030..48fa0e4 100644 --- a/conf/aeneria.cron +++ b/conf/aeneria.cron @@ -1 +1 @@ -* 1 * * * #USER# php7.3 #DESTDIR#/bin/console aeneria:fetch-data +0 1 * * * #USER# php7.3 #DESTDIR#/bin/console aeneria:fetch-data From 4b5201090a8ba2fdd1557025734ca7ff6f8e3a30 Mon Sep 17 00:00:00 2001 From: Kayou Date: Wed, 13 Jan 2021 13:51:38 +0100 Subject: [PATCH 2/4] Run cron every 20 minutes --- conf/aeneria.cron | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/aeneria.cron b/conf/aeneria.cron index 48fa0e4..e9b4b3a 100644 --- a/conf/aeneria.cron +++ b/conf/aeneria.cron @@ -1 +1 @@ -0 1 * * * #USER# php7.3 #DESTDIR#/bin/console aeneria:fetch-data +*/20 * * * * #USER# php7.3 #DESTDIR#/bin/console aeneria:fetch-data From e318b7d10c000dd44dfa70354793dcb7667a79a6 Mon Sep 17 00:00:00 2001 From: Simon Mellerin Date: Thu, 14 Jan 2021 09:28:20 +0100 Subject: [PATCH 3/4] Bump to aeneria 1.1.2 --- LICENSE | 4 ++-- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index dba13ed..04c49f5 100644 --- a/LICENSE +++ b/LICENSE @@ -629,8 +629,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + æneria + Copyright (C) 2021 Simon Mellerin This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/README.md b/README.md index 5f1b69d..b152fec 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.1 + **Shipped version:** 1.1.2 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 3a299ad..57768d5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://statics.aeneria.com/aeneria-app-1.1.1.tar.gz -SOURCE_SUM=f4450586b54b797adae06bf89739c6748cd411b064875830e49d42e861fac305 +SOURCE_URL=https://statics.aeneria.com/aeneria-app-1.1.2.tar.gz +SOURCE_SUM=d9ea2a79e434297dd5a7d60774a29b64c56ea70de3bc655c5a5e654bd11e13a5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 2abe4ff..85c1f39 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.1~ynh1", + "version": "1.1.2~ynh1", "url": "https://gitlab.com/aeneria/aeneria-app", "license": "AGPL-3.0-or-later", "maintainer": { From f51f799d23f20d7e963100408733037169d46127 Mon Sep 17 00:00:00 2001 From: Simon Mellerin Date: Sat, 16 Jan 2021 17:16:11 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Remove=20=C3=A6=20to=20avoid=20econding=20e?= =?UTF-8?q?rror?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 2 +- manifest.json | 14 +++++++------- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index 04c49f5..ca9ff8a 100644 --- a/LICENSE +++ b/LICENSE @@ -629,7 +629,7 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - æneria + aeneria Copyright (C) 2021 Simon Mellerin This program is free software: you can redistribute it and/or modify diff --git a/manifest.json b/manifest.json index 85c1f39..9071826 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "æneria", + "name": "aeneria", "id": "aeneria", "packaging_format": 1, "description": { @@ -28,8 +28,8 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain for æneria", - "fr": "Choisissez un domaine pour æneria" + "en": "Choose a domain for aeneria", + "fr": "Choisissez un domaine pour aeneria" }, "example": "domain.org" }, @@ -37,8 +37,8 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for æneria", - "fr": "Choisissez un chemin pour æneria" + "en": "Choose a path for aeneria", + "fr": "Choisissez un chemin pour aeneria" }, "example": "/aeneria", "default": "/aeneria" @@ -60,8 +60,8 @@ "name": "admin", "type": "user", "ask": { - "en": "Choose the æneria administrator", - "fr": "Choisissez l'administrateur de æneria" + "en": "Choose the aeneria administrator", + "fr": "Choisissez l'administrateur de aeneria" }, "example": "homer" } diff --git a/scripts/install b/scripts/install index c0a858e..4c50f0d 100644 --- a/scripts/install +++ b/scripts/install @@ -112,7 +112,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CONFIGURE AENERIA #================================================= -ynh_script_progression --message="Configuring æneria..." --weight=1 +ynh_script_progression --message="Configuring aeneria..." --weight=1 aeneria_conf="$final_path/.env" cp ../conf/.env $aeneria_conf @@ -128,7 +128,7 @@ chmod 600 "$aeneria_conf" #================================================= # INSTALL AENERIA #================================================= -ynh_script_progression --message="Installing æneria..." --weight=1 +ynh_script_progression --message="Installing aeneria..." --weight=1 # Set permissions to app files chown -R $app: $final_path diff --git a/scripts/upgrade b/scripts/upgrade index 6524915..7e4d983 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,7 +138,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie #================================================= # CONFIGURE AENERIA #================================================= -ynh_script_progression --message="Configuring æneria..." --weight=1 +ynh_script_progression --message="Configuring aeneria..." --weight=1 # Copy and set aeneria dist configuration aeneria_conf="$final_path/.env" @@ -155,7 +155,7 @@ chmod 600 "$aeneria_conf" #================================================= # UPGRADE AENERIA #================================================= -ynh_script_progression --message="Upgrading æneria..." --weight=1 +ynh_script_progression --message="Upgrading aeneria..." --weight=1 # Set permissions on app files chown -R $app: $final_path