YunoHost-Apps/zabbix_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/zabbix_ynh.git synced 2024-09-03 20:36:14 +02:00
Code Issues Activity Actions

Merge branch 'testing' into pr/46

Browse source
This commit is contained in:
Éric Gaspar 2023-12-01 09:00:00 +01:00
commit 5638c568bf
7 changed files with 52 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/updater.sh vendored
View file

@ -17,7 +17,13 @@
current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
version=$(curl --silent "https://api.github.com/repos/$repo/tags?page=2" | jq -r '.[] | select( .name | contains("rc") or contains("beta") or contains("alpha") or startswith("6") | not ) | .name' | sort -V | tail -1)
i=1
version=$(curl --silent "https://api.github.com/repos/$repo/tags?page=$i" | jq -r '.[] | select( .name | contains("rc") or contains("beta") or contains("alpha") or startswith("6") or startswith("7") | not ) | .name' | sort -V | tail -1)
while [ -z $version ] ; do
sleep 10
i=$(($i + 1))
version=$(curl --silent "https://api.github.com/repos/$repo/tags?page=$i" | jq -r '.[] | select( .name | contains("rc") or contains("beta") or contains("alpha") or startswith("6") or startswith("7") | not ) | .name' | sort -V | tail -1)
done
# Later down the script, we assume the version has only digits and dots
# Sometimes the release name starts with a "v", so let's filter it out.

4
.github/workflows/updater.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Fetch the source code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Run the updater script
@ -33,7 +33,7 @@ jobs:
- name: Create Pull Request
id: cpr
if: ${{ env.PROCEED == 'true' }}
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Update to version ${{ env.VERSION }}

7
README.md
View file

@ -5,7 +5,8 @@ It shall NOT be edited by hand.
# Zabbix for YunoHost
[![Integration level](https://dash.yunohost.org/integration/zabbix.svg)](https://dash.yunohost.org/appci/app/zabbix) ![Working status](https://ci-apps.yunohost.org/ci/badges/zabbix.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/zabbix.maintain.svg)
[![Integration level](https://dash.yunohost.org/integration/zabbix.svg)](https://dash.yunohost.org/appci/app/zabbix) ![Working status](https://ci-apps.yunohost.org/ci/badges/zabbix.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/zabbix.maintain.svg)
[![Install Zabbix with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=zabbix)
*[Lire ce readme en français.](./README_fr.md)*
@ -17,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
**Shipped version:** 5.0.20~ynh2
**Shipped version:** 5.0.40~ynh1
## Screenshots
@ -39,7 +40,7 @@ A monitoring tool for diverse IT components, including networks, servers, VMs an
* Official app website: <https://www.zabbix.com>
* Official admin documentation: <https://www.zabbix.com/manuals>
* Upstream app code repository: <https://github.com/zabbix/zabbix>
* YunoHost documentation for this app: <https://yunohost.org/app_zabbix>
* YunoHost Store: <https://apps.yunohost.org/app/zabbix>
* Report a bug: <https://github.com/YunoHost-Apps/zabbix_ynh/issues>
## Developer info

25
README_fr.md
View file

@ -5,24 +5,25 @@ It shall NOT be edited by hand.
# Zabbix pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/zabbix.svg)](https://dash.yunohost.org/appci/app/zabbix) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/zabbix.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/zabbix.maintain.svg)
[![Niveau d’intégration](https://dash.yunohost.org/integration/zabbix.svg)](https://dash.yunohost.org/appci/app/zabbix) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/zabbix.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/zabbix.maintain.svg)
[![Installer Zabbix avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=zabbix)
*[Read this readme in english.](./README.md)*
> *Ce package vous permet d'installer Zabbix rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
> *Ce package vous permet d’installer Zabbix rapidement et simplement sur un serveur YunoHost.
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
Un outil de surveillance pour divers composants informatiques, notamment les réseaux, les serveurs, les machines virtuelles et les services en nuage.
**Version incluse :** 5.0.20~ynh2
**Version incluse :** 5.0.40~ynh1
## Captures d'écran
## Captures d’écran
![Capture d'écran de Zabbix](./doc/screenshots/screenshot1.png)
![Capture d’écran de Zabbix](./doc/screenshots/screenshot1.png)
## Avertissements / informations importantes
@ -36,10 +37,10 @@ Un outil de surveillance pour divers composants informatiques, notamment les ré
* Un modèle YunoHost est importé et lié à l'hôte "Zabbix-server" (127.0.0.1) pour la surveillance de base de YunoHost.
## Documentations et ressources
* Site officiel de l'app : <https://www.zabbix.com>
* Documentation officielle de l'admin : <https://www.zabbix.com/manuals>
* Dépôt de code officiel de l'app : <https://github.com/zabbix/zabbix>
* Documentation YunoHost pour cette app : <https://yunohost.org/app_zabbix>
* Site officiel de l’app : <https://www.zabbix.com>
* Documentation officielle de l’admin : <https://www.zabbix.com/manuals>
* Dépôt de code officiel de l’app : <https://github.com/zabbix/zabbix>
* YunoHost Store: <https://apps.yunohost.org/app/zabbix>
* Signaler un bug : <https://github.com/YunoHost-Apps/zabbix_ynh/issues>
## Informations pour les développeurs
@ -54,4 +55,4 @@ ou
sudo yunohost app upgrade zabbix -u https://github.com/YunoHost-Apps/zabbix_ynh/tree/testing --debug
```
**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>

13
check_process
View file

@ -15,20 +15,15 @@
setup_private=1
setup_public=1
upgrade=1
# 4.4~ynh1
upgrade=1 from_commit=5cd502c98fdf4731938503541cf64a59aa43eda7
# 4.4~ynh3
upgrade=1 from_commit=9c1395710db75a5af897edc6ce6bcc8b1fc2d167
# 5.0.20~ynh2
upgrade=1 from_commit=8f8961c239f890069c867e40005db98465add0c9
backup_restore=1
multi_instance=0
port_already_use=1
change_url=1
;;; Options
Email=
Notification=none
;;; Upgrade options
; commit=5cd502c98fdf4731938503541cf64a59aa43eda7
name=4.4~ynh1.
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=PORT&
; commit=9c1395710db75a5af897edc6ce6bcc8b1fc2d167
name=4.4~ynh3
; commit=8f8961c239f890069c867e40005db98465add0c9
name=5.0.20~ynh2

26
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services",
"fr": "Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne"
},
"version": "5.0.20~ynh2",
"version": "5.0.40~ynh1",
"url": "https://www.zabbix.com",
"upstream": {
"license": "GPL-2.0-or-later",
@ -20,12 +20,12 @@
"email": ""
},
"requirements": {
"yunohost": ">= 4.3.0"
"yunohost": ">= 11.2"
},
"multi_instance": false,
"services": [
"nginx",
"php7.3-fpm",
"php7.4-fpm",
"mysql"
],
"arguments": {
@ -51,12 +51,28 @@
},
{
"name": "language",
"type": "string",
"type": "select",
"ask": {
"en": "Choose the application language",
"fr": "Choisissez la langue de l'application"
},
"choices": ["en_GB", "en_US", "cz_CN", "cs_CZ", "fr_FR", "ko_KR", "ja_JP", "nb_NO", "pl_PL", "pt_BR", "pt_PT", "ru_RU", "sk_SK", "tr_TR", "uk_UA"],
"choices": [
"en_GB",
"en_US",
"cz_CN",
"cs_CZ",
"fr_FR",
"ko_KR",
"ja_JP",
"nb_NO",
"pl_PL",
"pt_BR",
"pt_PT",
"ru_RU",
"sk_SK",
"tr_TR",
"uk_UA"
],
"default": "en_US"
},
{

2
scripts/_common.sh
View file

@ -4,7 +4,7 @@
# COMMON VARIABLES
#=================================================
YNH_PHP_VERSION="7.3"
YNH_PHP_VERSION="7.4"
# dependencies used by the app
if [ "$(lsb_release --codename --short)" = "bullseye" ]; then