1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/petrolette_ynh.git synced 2024-09-03 19:56:26 +02:00

update version to 1.3.0 (#8)

- update petrolette version
- move port definition from env to file
- fix linter warnings 

Co-authored-by: Tobias Ollive <tobias.ollive@oiseauroch.fr>
Co-authored-by: Yunohost-Bot <>
This commit is contained in:
oiseauroch 2021-06-23 14:35:45 +00:00 committed by GitHub
parent 2a3d414bb7
commit f36feef942
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 67 additions and 73 deletions

View file

@ -1,3 +1,8 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# Petrolette for YunoHost # Petrolette for YunoHost
[![Integration level](https://dash.yunohost.org/integration/petrolette.svg)](https://dash.yunohost.org/appci/app/petrolette) ![](https://ci-apps.yunohost.org/ci/badges/petrolette.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/petrolette.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/petrolette.svg)](https://dash.yunohost.org/appci/app/petrolette) ![](https://ci-apps.yunohost.org/ci/badges/petrolette.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/petrolette.maintain.svg)
@ -5,56 +10,36 @@
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
> *This package allows you to install Petrolette quickly and simply on a YunoHost server. > *This package allows you to install Petrolette 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.* If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
## License
This package is available under the license [GPLv3](https://www.gnu.org/licenses/agpl-3.0.html)
## Overview ## Overview
Pétrolette is a news reading home page, free. It is immediately usable without registration with the same URL on the desktop or a mobile device.
News feeds are organized into tabs, which can contain an infinite number of columns; everything is configurable, and saved directly in the browser cache. To view the same feeds on your phone, either export / import the petrolette.conf file, or (recommended) use the user's personal cloud synchronization feature. The news reader that doesn't know you
Petrolette **Shipped version:** 1.3.5~ynh1
**Shipped version:** 1.2.5 **Demo:** https://petrolette.space
## Screenshots ## Screenshots
![](https://framagit.org/yphil/assets/-/raw/master/img/petrolette.png) ![](./doc/screenshots/petrolette.png)
## Demo ## Documentation and resources
* [Official demo](petrolette.space) * Upstream app code repository: https://framagit.org/yphil/petrolette
* YunoHost documentation for this app: https://yunohost.org/app_petrolette
## Documentation * Report a bug: https://github.com/YunoHost-Apps/petrolette_ynh/issues
* YunoHost documentation: If specific documentation is needed, feel free to contribute.
## YunoHost specific features
#### Supported architectures
* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/petrolette%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/petrolette/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/petrolette%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/petrolette/)
## Links
* Report a bug: https://github.com/oiseauroch/petrolette_ynh/issues
* App website: http://petrolette.space/
* Upstream app repository: https://framagit.org/yphil/petrolette
* YunoHost website: https://yunohost.org/
---
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/petrolette/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/petrolette_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
``` ```
sudo yunohost app install https://github.com/Yunohost-Apps/petrolette_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/petrolette_ynh/tree/testing --debug
or or
sudo yunohost app upgrade petrolette -u https://github.com/Yunohost-Apps/petrolette_ynh/tree/testing --debug sudo yunohost app upgrade petrolette -u https://github.com/YunoHost-Apps/petrolette_ynh/tree/testing --debug
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps

View file

@ -1,55 +1,41 @@
# Petrolette pour YunoHost # Petrolette pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/petrolette.svg)](https://dash.yunohost.org/appci/app/petrolette) ![](https://ci-apps.yunohost.org/ci/badges/petrolette.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/petrolette.maintain.svg) [![Niveau d'intégration](https://dash.yunohost.org/integration/petrolette.svg)](https://dash.yunohost.org/appci/app/petrolette) ![](https://ci-apps.yunohost.org/ci/badges/petrolette.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/petrolette.maintain.svg)
[![Installer Whitebophir avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=petrolette) [![Installer Petrolette avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=petrolette)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Petrolette rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d'installer Petrolette rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
## Vue d'ensemble ## Vue d'ensemble
Pétrolette est une page d'accueil de lecture d'actualités, libre. Elle est immédiatement utilisable sans inscription avec la même URL dans le navigateur du bureau ou celui d'un appareil mobile. La page d'actu qui ne sait rien de toi
Les flux / sources sont organisés en onglets, qui peuvent contenir un nombre infini de colonnes ; tout est ré-organisable par glisser / déposer, et sauvegardé dans le cache du navigateur, ou dans le nuage. **Version incluse :** 1.3.5~ynh1
**Version incluse :** 1.2.5 **Démo :** https://petrolette.space
## Captures d'écran ## Captures d'écran
![](https://framagit.org/yphil/assets/-/raw/master/img/petrolette.png) ![](./doc/screenshots/petrolette.png)
## Démo ## Documentations et ressources
* [Démo officielle](petrolette.space) * Dépôt de code officiel de l'app : https://framagit.org/yphil/petrolette
* Documentation YunoHost pour cette app : https://yunohost.org/app_petrolette
## Documentation * Signaler un bug : https://github.com/YunoHost-Apps/petrolette_ynh/issues
* Documentation officielle : https://framagit.org/yphil/petrolette
## Caractéristiques spécifiques YunoHost
#### Architectures supportées
* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/petrolette%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/petrolette/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/petrolette%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/petrolette/)
## Liens
* Signaler un bug : https://github.com/oiseauroch/petrolette_ynh/issues
* Site de l'application : http://petrolette.space
* Dépôt de l'application principale : https://framagit.org/yphil/petrolette
* Site web YunoHost : https://yunohost.org/
---
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche dev](https://github.com/oiseauroch/petrolette/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/petrolette_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
``` ```
sudo yunohost app install https://github.com/Yunohost-Apps/petrolette/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/petrolette_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade whitebophir -u https://github.com/Yunohost-Apps/petrolette_ynh/tree/testing --debug sudo yunohost app upgrade petrolette -u https://github.com/YunoHost-Apps/petrolette_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://framagit.org/yphil/petrolette/-/archive/80f2c901ba4b40a12d664c7e567532ba5ea6157f/petrolette-80f2c901ba4b40a12d664c7e567532ba5ea6157f.tar.gz SOURCE_URL=https://framagit.org/yphil/petrolette/-/archive/v1.3.5/petrolette-v1.3.5.tar.gz
SOURCE_SUM=0fc5c6bc6f850c8e348faa5c0defd25ecf7ec1e35dda3c804f201c818f867649 SOURCE_SUM=ed18e4422fc8dcb766310dbe0e7cf9ab86bd711b94cfbb28fd39a002452a72a8
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

View file

@ -4,7 +4,6 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
Environment="PTL_PORT_HTTP=__PORT__"
Environment="__YNH_NODE_LOAD_PATH__" Environment="__YNH_NODE_LOAD_PATH__"
User=__APP__ User=__APP__
Group=__APP__ Group=__APP__

6
doc/manifest.md Normal file
View file

@ -0,0 +1,6 @@
- require a dedicated domain
- the application doesn't store anything locally. Restore/uprade operation is basically reinstalling the app.

Binary file not shown.

After

Width:  |  Height:  |  Size: 521 KiB

View file

@ -7,14 +7,19 @@
"fr": "La page d'actu qui ne sait rien de toi" "fr": "La page d'actu qui ne sait rien de toi"
}, },
"url": "https://framagit.org/yphil/petrolette", "url": "https://framagit.org/yphil/petrolette",
"version": "1.2.5~ynh3", "upstream": {
"license": "GPL-3.0-only", "license": "AGPL-3.0-only",
"demo": "https://petrolette.space",
"code": "https://framagit.org/yphil/petrolette"
},
"version": "1.3.5~ynh1",
"license": "AGPL-3.0-only",
"maintainer": [{ "maintainer": [{
"name": "oiseauroch.", "name": "oiseauroch.",
"email": "tobias.ollive@oiseauroch.fr" "email": "tobias.ollive@oiseauroch.fr"
}], }],
"requirements": { "requirements": {
"yunohost": ">= 4.1.0" "yunohost": ">= 4.2.0"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [

View file

@ -95,6 +95,9 @@ ynh_system_user_create --username=$app --home_dir=$final_path
ynh_script_progression --message="Installing application using node..." ynh_script_progression --message="Installing application using node..."
pushd $final_path pushd $final_path
# set port in configuration file
sed -i "/HTTP_PORT/s/[0-9]*[0-9]/$port/" package.json
sed -i "/HTTPS_PORT/s/[0-9]*[0-9]/$https_port/" package.json
# use custom home value to avoid bower storing values in root and have right errors # use custom home value to avoid bower storing values in root and have right errors
[[ -v HOME ]] && TMP_HOME=$HOME [[ -v HOME ]] && TMP_HOME=$HOME
HOME=$(pwd) HOME=$(pwd)
@ -125,7 +128,7 @@ yunohost service add $app --description="The news reader that doesn't know you"
ynh_script_progression --message="Configuring a systemd service..." ynh_script_progression --message="Configuring a systemd service..."
# Create a dedicated systemd config # Create a dedicated systemd config
ynh_add_systemd_config --others_var="port ynh_node_load_PATH" ynh_add_systemd_config
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE

View file

@ -31,6 +31,8 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path) path_url=$(ynh_app_setting_get --app=$app --key=path)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
port=$(ynh_app_setting_get --app=$app --key=port)
https_port=$(ynh_app_setting_get --app=$app --key=https_port)
#================================================= #=================================================
# CHECK IF THE APP CAN BE RESTORED # CHECK IF THE APP CAN BE RESTORED
@ -68,6 +70,10 @@ ynh_script_progression --message="Reinstalling the app ..." --weight=5
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path"
pushd $final_path pushd $final_path
pushd $final_path
# set port in configuration file
sed -i "/HTTP_PORT/s/[0-9]*[0-9]/$port/" package.json
sed -i "/HTTPS_PORT/s/[0-9]*[0-9]/$https_port/" package.json
TMP_HOME=$HOME TMP_HOME=$HOME
HOME=$(pwd) HOME=$(pwd)
ynh_use_nodejs ynh_use_nodejs

View file

@ -84,6 +84,10 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
ynh_script_progression --message="Upgrading the app..." --weight=5 ynh_script_progression --message="Upgrading the app..." --weight=5
pushd $final_path pushd $final_path
# set port in configuration file
sed -i "/HTTP_PORT/s/[0-9]*[0-9]/$port/" package.json
sed -i "/HTTPS_PORT/s/[0-9]*[0-9]/$https_port/" package.json
TMP_HOME=$HOME TMP_HOME=$HOME
HOME=$(pwd) HOME=$(pwd)
ynh_use_nodejs ynh_use_nodejs