mirror of
https://github.com/YunoHost-Apps/wetty_ynh.git
synced 2024-09-03 18:16:29 +02:00
Upgrade to v.2.0.2
This commit is contained in:
parent
d1a00f3d79
commit
95f7f7a068
10 changed files with 30 additions and 61 deletions
22
README.md
22
README.md
|
@ -1,17 +1,17 @@
|
|||
# Wetty for YunoHost
|
||||
|
||||
[![Integration level](https://dash.yunohost.org/integration/wetty.svg)](https://dash.yunohost.org/appci/app/wetty) ![](https://ci-apps.yunohost.org/ci/badges/wetty.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/wetty.maintain.svg)
|
||||
[![Install wetty with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wetty)
|
||||
[![Integration level](https://dash.yunohost.org/integration/wetty.svg)](https://dash.yunohost.org/appci/app/wetty) ![](https://ci-apps.yunohost.org/ci/badges/wetty.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/wetty.maintain.svg)
|
||||
[![Install Wetty with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wetty)
|
||||
|
||||
*[Lire ce readme en français.](./README_fr.md)*
|
||||
|
||||
> *This package allows you to install wetty quickly and simply on a YunoHost server.
|
||||
> *This package allows you to install Wetty 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.*
|
||||
|
||||
## Overview
|
||||
Terminal in browser over http/https. (Ajaxterm/Anyterm alternative, but much better)
|
||||
|
||||
**Shipped version:** 1.3.0
|
||||
**Shipped version:** 2.0.2
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
@ -19,8 +19,8 @@ Terminal in browser over http/https. (Ajaxterm/Anyterm alternative, but much bet
|
|||
|
||||
## Configuration
|
||||
|
||||
There is few configuration in Wetty :
|
||||
* Startup config (listen port, url path, ssh host) is contained in the SystemD service file
|
||||
There is few configuration in Wetty:
|
||||
* Startup config (listen port, URL path, ssh host) is contained in the SystemD service file
|
||||
* User interface configuration is done through the web gui itself.
|
||||
|
||||
## Documentation
|
||||
|
@ -34,7 +34,7 @@ There is few configuration in Wetty :
|
|||
|
||||
Multi-user doesn't really mean anything. You can log as any *system* user that allows local SSH login.
|
||||
|
||||
You can specify at install if users should log into Yunohost first to be able to access Wetty, or if visitors can access it too.
|
||||
You can specify at install if users should log into YunoHost first to be able to access Wetty, or if visitors can access it too.
|
||||
|
||||
#### Supported architectures
|
||||
|
||||
|
@ -53,10 +53,8 @@ You can specify at install if users should log into Yunohost first to be able to
|
|||
|
||||
---
|
||||
|
||||
Developer info
|
||||
----------------
|
||||
## Developer info
|
||||
|
||||
**Only if you want to use a testing branch for coding, instead of merging directly into master.**
|
||||
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/wetty_ynh/tree/testing).
|
||||
|
||||
To try the testing branch, please proceed like that.
|
||||
|
@ -65,7 +63,3 @@ sudo yunohost app install https://github.com/YunoHost-Apps/wetty_ynh/tree/testin
|
|||
or
|
||||
sudo yunohost app upgrade wetty -u https://github.com/YunoHost-Apps/wetty_ynh/tree/testing --debug
|
||||
```
|
||||
|
||||
# TODO
|
||||
- Add a `LICENSE` file for the package.
|
||||
- Edit `README_fr.md`.
|
||||
|
|
24
README_fr.md
24
README_fr.md
|
@ -1,17 +1,17 @@
|
|||
# Wetty pour YunoHost
|
||||
|
||||
[![Niveau d'intégration](https://dash.yunohost.org/integration/wetty.svg)](https://dash.yunohost.org/appci/app/wetty) ![](https://ci-apps.yunohost.org/ci/badges/wetty.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/wetty.maintain.svg)
|
||||
[![Installer wetty avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wetty)
|
||||
[![Niveau d'intégration](https://dash.yunohost.org/integration/wetty.svg)](https://dash.yunohost.org/appci/app/wetty) ![](https://ci-apps.yunohost.org/ci/badges/wetty.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/wetty.maintain.svg)
|
||||
[![Installer Wetty avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wetty)
|
||||
|
||||
*[Read this readme in english.](./README.md)*
|
||||
|
||||
> *Ce package vous permet d'installer wetty rapidement et simplement sur un serveur YunoHost.
|
||||
> *Ce package vous permet d'installer Wetty 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.*
|
||||
|
||||
## Vue d'ensemble
|
||||
Terminal dans un navigateur par http/https. (Alternative à Ajaxterm/Anyterm, mais bien meilleure)
|
||||
|
||||
**Version incluse :** 1.3.0
|
||||
**Version incluse :** 2.0.2
|
||||
|
||||
## Captures d'écran
|
||||
|
||||
|
@ -19,9 +19,9 @@ Terminal dans un navigateur par http/https. (Alternative à Ajaxterm/Anyterm, ma
|
|||
|
||||
## Configuration
|
||||
|
||||
There is few configuration in Wetty :
|
||||
* Startup config (listen port, url path, ssh host) is contained in the SystemD service file
|
||||
* User interface configuration is done through the web gui itself.
|
||||
Il y a peu de configuration dans Wetty :
|
||||
* La configuration de démarrage (port d'écoute, chemin d'url, hôte ssh) est contenue dans le fichier de service SystemD
|
||||
* La configuration de l'interface utilisateur se fait via l'interface graphique Web elle-même.
|
||||
|
||||
## Documentation
|
||||
|
||||
|
@ -33,11 +33,11 @@ There is few configuration in Wetty :
|
|||
#### Support multi-utilisateur
|
||||
|
||||
* L'authentification LDAP et HTTP est-elle prise en charge ?
|
||||
* L'application peut-elle être utilisée par plusieurs utilisateurs ?
|
||||
* L'application peut-elle être utilisée par plusieurs utilisateurs ?
|
||||
|
||||
Multi-user doesn't really mean anything. You can log as any *system* user that allows local SSH login.
|
||||
La notion de multi-utilisateur ne s'applique pas. Vous pouvez vous connecter en tant que n'importe quel utilisateur *système* qui autorise la connexion SSH locale.
|
||||
|
||||
You can specify at install if users should log into Yunohost first to be able to access Wetty, or if visitors can access it too.
|
||||
Vous pouvez spécifier lors de l'installation si les utilisateurs doivent d'abord se connecter à YunoHost pour pouvoir accéder à Wetty, ou si les visiteurs peuvent également y accéder.
|
||||
|
||||
#### Architectures supportées
|
||||
|
||||
|
@ -56,10 +56,8 @@ You can specify at install if users should log into Yunohost first to be able to
|
|||
|
||||
---
|
||||
|
||||
Informations pour les développeurs
|
||||
----------------
|
||||
## Informations pour les développeurs
|
||||
|
||||
**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.**
|
||||
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/wetty_ynh/tree/testing).
|
||||
|
||||
Pour essayer la branche testing, procédez comme suit.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
SOURCE_URL=https://github.com/butlerx/wetty/archive/v1.3.0.tar.gz
|
||||
SOURCE_SUM=d78474334f358de44ce4a845bf3eea3add2aed5c91fd9150f8478d6091e26866
|
||||
SOURCE_URL=https://github.com/butlerx/wetty/archive/v2.0.2.tar.gz
|
||||
SOURCE_SUM=8bc879993d53da6b672a866354bc8568ca17f1b82a91dcd8561de90e9bfc0370
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=tar.gz
|
||||
SOURCE_IN_SUBDIR=true
|
||||
|
|
|
@ -7,8 +7,8 @@ about: Create a report to help us debug, it would be nice to fill the template a
|
|||
**How to post a meaningful bug report**
|
||||
1. *Read this whole template first.*
|
||||
2. *Determine if you are on the right place:*
|
||||
- *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!*
|
||||
- *Otherwise, the issue may be due to REPLACEBYYOURAPP itself. Refer to its documentation or repository for help.*
|
||||
- *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!*
|
||||
- *Otherwise, the issue may be due to Wetty itself. Refer to its documentation or repository for help.*
|
||||
- *If you have a doubt, post here, we will figure it out together.*
|
||||
3. *Delete the italic comments as you write over them below, and remove this guide.*
|
||||
---
|
||||
|
@ -29,13 +29,13 @@ about: Create a report to help us debug, it would be nice to fill the template a
|
|||
*Steps to reproduce the behavior.*
|
||||
- *If you performed a command from the CLI, the command itself is enough. For example:*
|
||||
```sh
|
||||
sudo yunohost app install REPLACEBYYOURAPP
|
||||
sudo yunohost app install wetty
|
||||
```
|
||||
- *If you used the webadmin, please perform the equivalent command from the CLI first.*
|
||||
- *If the error occurs in your browser, explain what you did:*
|
||||
1. *Go to '...'*
|
||||
2. *Click on '....'*
|
||||
3. *Scroll down to '....'*
|
||||
2. *Click on '...'*
|
||||
3. *Scroll down to '...'*
|
||||
4. *See error*
|
||||
|
||||
**Expected behavior**
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Terminal in browser over http/https. (Ajaxterm/Anyterm alternative, but much better)",
|
||||
"fr": "Un terminal dans le navigateur sur http/https. (Alternative à Ajaxterm/Anyterm, mais bien meilleur)"
|
||||
},
|
||||
"version": "1.3.0~ynh1",
|
||||
"version": "2.0.2~ynh1",
|
||||
"url": "https://github.com/butlerx/wetty/",
|
||||
"license": "free",
|
||||
"maintainer": {
|
||||
|
|
|
@ -15,4 +15,4 @@
|
|||
---
|
||||
*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
|
||||
|
||||
[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/)
|
||||
[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/wetty_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/wetty_ynh%20PR-NUM-%20(USERNAME)/)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
# dependencies used by the app
|
||||
# pkg_dependencies=""
|
||||
|
||||
YNH_NODEJS_VERSION=10
|
||||
YNH_NODEJS_VERSION=12
|
||||
|
||||
#=================================================
|
||||
# PERSONAL HELPERS
|
||||
|
|
|
@ -35,11 +35,6 @@ domain=$(ynh_app_setting_get --app="$app" --key=domain)
|
|||
#=================================================
|
||||
ynh_print_info --message="Declaring files to be backed up..."
|
||||
|
||||
### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs
|
||||
### to be backuped and not an actual copy of any file. The actual backup that
|
||||
### creates and fill the archive with the files happens in the core after this
|
||||
### script is called. Hence ynh_backups calls takes basically 0 seconds to run.
|
||||
|
||||
#=================================================
|
||||
# BACKUP THE APP MAIN DIR
|
||||
#=================================================
|
||||
|
|
|
@ -35,7 +35,7 @@ port=$(ynh_app_setting_get --app="$app" --key=port)
|
|||
#=================================================
|
||||
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
||||
#=================================================
|
||||
ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." --weight=1
|
||||
ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
|
||||
|
||||
# Backup the current version of the app
|
||||
ynh_backup_before_upgrade
|
||||
|
|
|
@ -26,12 +26,6 @@ port=$(ynh_app_setting_get --app="$app" --key=port)
|
|||
# CHECK VERSION
|
||||
#=================================================
|
||||
|
||||
### This helper will compare the version of the currently installed app and the version of the upstream package.
|
||||
### $upgrade_type can have 2 different values
|
||||
### - UPGRADE_APP if the upstream app version has changed
|
||||
### - UPGRADE_PACKAGE if only the YunoHost package has changed
|
||||
### ynh_check_app_version_changed will stop the upgrade if the app is up to date.
|
||||
### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do.
|
||||
upgrade_type=$(ynh_check_app_version_changed)
|
||||
|
||||
#=================================================
|
||||
|
@ -68,18 +62,6 @@ ynh_clean_setup () {
|
|||
# Exit if an error occurs during the execution of the script
|
||||
ynh_abort_if_errors
|
||||
|
||||
#=================================================
|
||||
# CHECK THE PATH
|
||||
#=================================================
|
||||
|
||||
# Normalize the URL path syntax
|
||||
# N.B. : this is for app installations before YunoHost 2.7
|
||||
# where this value might be something like /foo/ or foo/
|
||||
# instead of /foo ....
|
||||
# If nobody installed your app before 2.7, then you may
|
||||
# safely remove this line
|
||||
path_url=$(ynh_normalize_url_path --path_url="$path_url")
|
||||
|
||||
#=================================================
|
||||
# STANDARD UPGRADE STEPS
|
||||
#=================================================
|
||||
|
|
Loading…
Reference in a new issue