From 0336f96cc65d87add148f31ecfe10dbc39c37c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 31 Dec 2020 15:31:31 +0100 Subject: [PATCH 1/3] Set badge to SVG --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 43f0962..80dac6c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # æneria for YunoHost -[![Integration level](https://dash.yunohost.org/integration/aeneria.svg)](https://dash.yunohost.org/appci/app/aeneria) ![](https://ci-apps.yunohost.org/ci/badges/aeneria.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/aeneria.maintain.svg) -[![Install æneria with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=aeneria) +[![Integration level](https://dash.yunohost.org/integration/aeneria.svg)](https://dash.yunohost.org/appci/app/aeneria) ![](https://ci-apps.yunohost.org/ci/badges/aeneria.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/aeneria.maintain.svg) +[![Install æneria with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=aeneria) > *This package allows you to install æeneria quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* From a64f946383c2ebe2caad0ecaf10ee67465648388 Mon Sep 17 00:00:00 2001 From: Simon Mellerin Date: Mon, 4 Jan 2021 21:49:13 +0100 Subject: [PATCH 2/3] Bump to aeneria 1.1.0 --- README.md | 2 +- conf/.env | 6 +++++- conf/app.src | 4 ++-- manifest.json | 6 +++--- scripts/install | 1 + scripts/upgrade | 15 ++++++++------- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 80dac6c..32cf738 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The idea of [æneria](https://gitlab.com/aeneria/aeneria-app) is to display ener * Better understand our own energy consumption * Analyse energy consumption throw weather data - **Shipped version:** 1.0.4 + **Shipped version:** 1.1.0 ## Screenshots diff --git a/conf/.env b/conf/.env index 30c4300..4a359a0 100644 --- a/conf/.env +++ b/conf/.env @@ -1,6 +1,6 @@ ###> symfony/framework-bundle ### APP_ENV=prod -APP_SECRET=app_secret_you_should_change_this_value +APP_SECRET=app_secret #TRUSTED_PROXIES=127.0.0.1,127.0.0.2 #TRUSTED_HOSTS='^localhost|example\.com$' ###< symfony/framework-bundle ### @@ -14,6 +14,10 @@ APP_SECRET=app_secret_you_should_change_this_value DATABASE_URL=pgsql://database_user:database_password@localhost:5432/database_name ###< doctrine/doctrine-bundle ### +# Use this variable if your application live +# in subfolder +BASE_PATH=base_path + ### aeneria features ### # Number of places a user can create AENERIA_USER_MAX_PLACES=-1 diff --git a/conf/app.src b/conf/app.src index 3d9e227..91c5765 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://statics.aeneria.com/aeneria-app-1.0.4.tar.gz -SOURCE_SUM=900e165d2992c1349b2ed1fff8fda7ec999b78c70e6a14043800defdb715a91d +SOURCE_URL=https://statics.aeneria.com/aeneria-app-1.1.0.tar.gz +SOURCE_SUM=5902cc47a1f80ed560ea8f4bee37035d420b7f6bcd24151df417ecae6e4ebbf5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 6df8e61..3f83297 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "id": "aeneria", "packaging_format": 1, "description": { - "en": "A little dashboard to analyse your electricity consumption data from Linky & weather", - "fr": "Un petit tableau de bord pour analyser votre consomation d'électricité à partir des données d'un Linky et de la météo" + "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.0.4~ynh1", + "version": "1.1.0~ynh1", "url": "https://gitlab.com/aeneria/aeneria-app", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index c0a858e..0a9eff8 100644 --- a/scripts/install +++ b/scripts/install @@ -121,6 +121,7 @@ ynh_replace_string --match_string="database_name" --replace_string="${db_name}" ynh_replace_string --match_string="database_user" --replace_string="${db_user}" --target_file="$aeneria_conf" ynh_replace_string --match_string="database_password" --replace_string="${db_pwd}" --target_file="$aeneria_conf" ynh_replace_string --match_string="app_secret" --replace_string="${deskey}" --target_file="$aeneria_conf" +ynh_replace_string --match_string="base_path" --replace_string="${path_url}" --target_file="$aeneria_conf" # Restrict rights to aeneria user only chmod 600 "$aeneria_conf" diff --git a/scripts/upgrade b/scripts/upgrade index 4672232..cef9819 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -141,16 +141,17 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie ynh_script_progression --message="Configuring æneria..." --weight=1 # Copy and set aeneria dist configuration -aneria_conf="$final_path/.env" -cp ../conf/.env $aneria_conf +aeneria_conf="$final_path/.env" +cp ../conf/.env $aeneria_conf -ynh_replace_string --match_string="database_name" --replace_string="${db_name}" --target_file="$aneria_conf" -ynh_replace_string --match_string="database_user" --replace_string="${db_user}" --target_file="$aneria_conf" -ynh_replace_string --match_string="database_password" --replace_string="${db_pwd}" --target_file="$aneria_conf" -ynh_replace_string --match_string="app_secret" --replace_string="${deskey}" --target_file="$aneria_conf" +ynh_replace_string --match_string="database_name" --replace_string="${db_name}" --target_file="$aeneria_conf" +ynh_replace_string --match_string="database_user" --replace_string="${db_user}" --target_file="$aeneria_conf" +ynh_replace_string --match_string="database_password" --replace_string="${db_pwd}" --target_file="$aeneria_conf" +ynh_replace_string --match_string="app_secret" --replace_string="${deskey}" --target_file="$aeneria_conf" +ynh_replace_string --match_string="base_path" --replace_string="${path_url}" --target_file="$aeneria_conf" # Restrict rights to aeneria user only -chmod 600 "$aneria_conf" +chmod 600 "$aeneria_conf" #================================================= # UPGRADE AENERIA From f8d8ec01fb70c29779b1900f466c1512d6a2e1b0 Mon Sep 17 00:00:00 2001 From: Simon Mellerin Date: Wed, 6 Jan 2021 11:42:30 +0100 Subject: [PATCH 3/3] Bump to aeneria 1.1.1 --- README.md | 4 ++-- conf/.env | 4 ---- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 1 - scripts/upgrade | 1 - 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 32cf738..0241fb5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # æneria for YunoHost -[![Integration level](https://dash.yunohost.org/integration/aeneria.svg)](https://dash.yunohost.org/appci/app/aeneria) ![](https://ci-apps.yunohost.org/ci/badges/aeneria.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/aeneria.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/aeneria.svg)](https://dash.yunohost.org/appci/app/aeneria) ![](https://ci-apps.yunohost.org/ci/badges/aeneria.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/aeneria.maintain.svg) [![Install æneria with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=aeneria) > *This package allows you to install æeneria quickly and simply on a YunoHost server. @@ -12,7 +12,7 @@ The idea of [æneria](https://gitlab.com/aeneria/aeneria-app) is to display ener * Better understand our own energy consumption * Analyse energy consumption throw weather data - **Shipped version:** 1.1.0 + **Shipped version:** 1.1.1 ## Screenshots diff --git a/conf/.env b/conf/.env index 4a359a0..905d887 100644 --- a/conf/.env +++ b/conf/.env @@ -14,10 +14,6 @@ APP_SECRET=app_secret DATABASE_URL=pgsql://database_user:database_password@localhost:5432/database_name ###< doctrine/doctrine-bundle ### -# Use this variable if your application live -# in subfolder -BASE_PATH=base_path - ### aeneria features ### # Number of places a user can create AENERIA_USER_MAX_PLACES=-1 diff --git a/conf/app.src b/conf/app.src index 91c5765..3a299ad 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://statics.aeneria.com/aeneria-app-1.1.0.tar.gz -SOURCE_SUM=5902cc47a1f80ed560ea8f4bee37035d420b7f6bcd24151df417ecae6e4ebbf5 +SOURCE_URL=https://statics.aeneria.com/aeneria-app-1.1.1.tar.gz +SOURCE_SUM=f4450586b54b797adae06bf89739c6748cd411b064875830e49d42e861fac305 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 3f83297..2abe4ff 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.0~ynh1", + "version": "1.1.1~ynh1", "url": "https://gitlab.com/aeneria/aeneria-app", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index 0a9eff8..c0a858e 100644 --- a/scripts/install +++ b/scripts/install @@ -121,7 +121,6 @@ ynh_replace_string --match_string="database_name" --replace_string="${db_name}" ynh_replace_string --match_string="database_user" --replace_string="${db_user}" --target_file="$aeneria_conf" ynh_replace_string --match_string="database_password" --replace_string="${db_pwd}" --target_file="$aeneria_conf" ynh_replace_string --match_string="app_secret" --replace_string="${deskey}" --target_file="$aeneria_conf" -ynh_replace_string --match_string="base_path" --replace_string="${path_url}" --target_file="$aeneria_conf" # Restrict rights to aeneria user only chmod 600 "$aeneria_conf" diff --git a/scripts/upgrade b/scripts/upgrade index cef9819..6524915 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -148,7 +148,6 @@ ynh_replace_string --match_string="database_name" --replace_string="${db_name}" ynh_replace_string --match_string="database_user" --replace_string="${db_user}" --target_file="$aeneria_conf" ynh_replace_string --match_string="database_password" --replace_string="${db_pwd}" --target_file="$aeneria_conf" ynh_replace_string --match_string="app_secret" --replace_string="${deskey}" --target_file="$aeneria_conf" -ynh_replace_string --match_string="base_path" --replace_string="${path_url}" --target_file="$aeneria_conf" # Restrict rights to aeneria user only chmod 600 "$aeneria_conf"