Skip to content

Commit

Permalink
Merge pull request #29 from YunoHost-Apps/master-promotion
Browse files Browse the repository at this point in the history
Upgrade master from testing
  • Loading branch information
ewilly authored Sep 14, 2024
2 parents 252d6a0 + 1c18e8f commit 6ef4d16
Show file tree
Hide file tree
Showing 18 changed files with 325 additions and 186 deletions.
3 changes: 3 additions & 0 deletions ALL_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@
- [Irakurri README euskaraz](README_eu.md)
- [Lire le README en français](README_fr.md)
- [Le o README en galego](README_gl.md)
- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
- [Lees de README in het Nederlands](README_nl.md)
- [Прочитать README на русский](README_ru.md)
- [阅读中文(简体)的 README](README_zh_Hans.md)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ It shall NOT be edited by hand.

# Scrutiny for YunoHost

[![Integration level](https://dash.yunohost.org/integration/scrutiny.svg)](https://dash.yunohost.org/appci/app/scrutiny) ![Working status](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)
[![Integration level](https://dash.yunohost.org/integration/scrutiny.svg)](https://ci-apps.yunohost.org/ci/apps/scrutiny/) ![Working status](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)

[![Install Scrutiny with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scrutiny)

Expand Down Expand Up @@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
- (Future) Hard Drive performance testing & tracking


**Shipped version:** 0.8.1~ynh1
**Shipped version:** 0.8.1~ynh2

## Screenshots

Expand Down
6 changes: 3 additions & 3 deletions README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ No se debe editar a mano.

# Scrutiny para Yunohost

[![Nivel de integración](https://dash.yunohost.org/integration/scrutiny.svg)](https://dash.yunohost.org/appci/app/scrutiny) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)
[![Nivel de integración](https://dash.yunohost.org/integration/scrutiny.svg)](https://ci-apps.yunohost.org/ci/apps/scrutiny/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)

[![Instalar Scrutiny con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scrutiny)

Expand Down Expand Up @@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
- (Future) Hard Drive performance testing & tracking


**Versión actual:** 0.8.1~ynh1
**Versión actual:** 0.8.1~ynh2

## Capturas

Expand All @@ -50,7 +50,7 @@ Scrutiny is a simple but focused application, with a couple of core features:

## Información para desarrolladores

Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing
Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing).

Para probar la rama `testing`, sigue asÍ:

Expand Down
4 changes: 2 additions & 2 deletions README_eu.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EZ editatu eskuz.

# Scrutiny YunoHost-erako

[![Integrazio maila](https://dash.yunohost.org/integration/scrutiny.svg)](https://dash.yunohost.org/appci/app/scrutiny) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)
[![Integrazio maila](https://dash.yunohost.org/integration/scrutiny.svg)](https://ci-apps.yunohost.org/ci/apps/scrutiny/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)

[![Instalatu Scrutiny YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scrutiny)

Expand Down Expand Up @@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
- (Future) Hard Drive performance testing & tracking


**Paketatutako bertsioa:** 0.8.1~ynh1
**Paketatutako bertsioa:** 0.8.1~ynh2

## Pantaila-argazkiak

Expand Down
4 changes: 2 additions & 2 deletions README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.

# Scrutiny pour YunoHost

[![Niveau d’intégration](https://dash.yunohost.org/integration/scrutiny.svg)](https://dash.yunohost.org/appci/app/scrutiny) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)
[![Niveau d’intégration](https://dash.yunohost.org/integration/scrutiny.svg)](https://ci-apps.yunohost.org/ci/apps/scrutiny/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)

[![Installer Scrutiny avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scrutiny)

Expand Down Expand Up @@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
- (Future) Hard Drive performance testing & tracking


**Version incluse :** 0.8.1~ynh1
**Version incluse :** 0.8.1~ynh2

## Captures d’écran

Expand Down
4 changes: 2 additions & 2 deletions README_gl.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ NON debe editarse manualmente.

# Scrutiny para YunoHost

[![Nivel de integración](https://dash.yunohost.org/integration/scrutiny.svg)](https://dash.yunohost.org/appci/app/scrutiny) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)
[![Nivel de integración](https://dash.yunohost.org/integration/scrutiny.svg)](https://ci-apps.yunohost.org/ci/apps/scrutiny/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)

[![Instalar Scrutiny con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scrutiny)

Expand Down Expand Up @@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
- (Future) Hard Drive performance testing & tracking


**Versión proporcionada:** 0.8.1~ynh1
**Versión proporcionada:** 0.8.1~ynh2

## Capturas de pantalla

Expand Down
63 changes: 63 additions & 0 deletions README_id.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<!--
N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
Ini TIDAK boleh diedit dengan tangan.
-->

# Scrutiny untuk YunoHost

[![Tingkat integrasi](https://dash.yunohost.org/integration/scrutiny.svg)](https://ci-apps.yunohost.org/ci/apps/scrutiny/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)

[![Pasang Scrutiny dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scrutiny)

*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*

> *Paket ini memperbolehkan Anda untuk memasang Scrutiny secara cepat dan mudah pada server YunoHost.*
> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
## Ringkasan

**Scrutiny is a Hard Drive Health Dashboard & Monitoring solution, merging manufacturer provided S.M.A.R.T metrics with real-world failure rates.**

> NOTE: Scrutiny is a Work-in-Progress and still has some rough edges.
### Features

Scrutiny is a simple but focused application, with a couple of core features:

- Web UI Dashboard - focused on Critical metrics
- `smartd` integration (no re-inventing the wheel)
- Auto-detection of all connected hard-drives
- S.M.A.R.T metric tracking for historical trends
- Customized thresholds using real world failure rates
- Temperature tracking
- Provided as an all-in-one Docker image (but can be installed manually)
- Configurable Alerting/Notifications via Webhooks
- (Future) Hard Drive performance testing & tracking


**Versi terkirim:** 0.8.1~ynh2

## Tangkapan Layar

![Tangkapan Layar pada Scrutiny](./doc/screenshots/dashboard.png)

## Dokumentasi dan sumber daya

- Dokumentasi admin resmi: <https://github.com/AnalogJ/scrutiny/tree/master/docs>
- Depot kode aplikasi hulu: <https://github.com/AnalogJ/scrutiny>
- Gudang YunoHost: <https://apps.yunohost.org/app/scrutiny>
- Laporkan bug: <https://github.com/YunoHost-Apps/scrutiny_ynh/issues>

## Info developer

Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing).

Untuk mencoba branch `testing`, silakan dilanjutkan seperti:

```bash
sudo yunohost app install https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing --debug
atau
sudo yunohost app upgrade scrutiny -u https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing --debug
```

**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
63 changes: 63 additions & 0 deletions README_nl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<!--
NB: Deze README is automatisch gegenereerd door <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
Hij mag NIET handmatig aangepast worden.
-->

# Scrutiny voor Yunohost

[![Integratieniveau](https://dash.yunohost.org/integration/scrutiny.svg)](https://ci-apps.yunohost.org/ci/apps/scrutiny/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)

[![Scrutiny met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scrutiny)

*[Deze README in een andere taal lezen.](./ALL_README.md)*

> *Met dit pakket kun je Scrutiny snel en eenvoudig op een YunoHost-server installeren.*
> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.*
## Overzicht

**Scrutiny is a Hard Drive Health Dashboard & Monitoring solution, merging manufacturer provided S.M.A.R.T metrics with real-world failure rates.**

> NOTE: Scrutiny is a Work-in-Progress and still has some rough edges.
### Features

Scrutiny is a simple but focused application, with a couple of core features:

- Web UI Dashboard - focused on Critical metrics
- `smartd` integration (no re-inventing the wheel)
- Auto-detection of all connected hard-drives
- S.M.A.R.T metric tracking for historical trends
- Customized thresholds using real world failure rates
- Temperature tracking
- Provided as an all-in-one Docker image (but can be installed manually)
- Configurable Alerting/Notifications via Webhooks
- (Future) Hard Drive performance testing & tracking


**Geleverde versie:** 0.8.1~ynh2

## Schermafdrukken

![Schermafdrukken van Scrutiny](./doc/screenshots/dashboard.png)

## Documentatie en bronnen

- Officiele beheerdersdocumentatie: <https://github.com/AnalogJ/scrutiny/tree/master/docs>
- Upstream app codedepot: <https://github.com/AnalogJ/scrutiny>
- YunoHost-store: <https://apps.yunohost.org/app/scrutiny>
- Meld een bug: <https://github.com/YunoHost-Apps/scrutiny_ynh/issues>

## Ontwikkelaarsinformatie

Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing).

Om de `testing`-branch uit te proberen, ga als volgt te werk:

```bash
sudo yunohost app install https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing --debug
of
sudo yunohost app upgrade scrutiny -u https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing --debug
```

**Verdere informatie over app-packaging:** <https://yunohost.org/packaging_apps>
63 changes: 63 additions & 0 deletions README_ru.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<!--
Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
Он НЕ ДОЛЖЕН редактироваться вручную.
-->

# Scrutiny для YunoHost

[![Уровень интеграции](https://dash.yunohost.org/integration/scrutiny.svg)](https://ci-apps.yunohost.org/ci/apps/scrutiny/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)

[![Установите Scrutiny с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scrutiny)

*[Прочтите этот README на других языках.](./ALL_README.md)*

> *Этот пакет позволяет Вам установить Scrutiny быстро и просто на YunoHost-сервер.*
> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
## Обзор

**Scrutiny is a Hard Drive Health Dashboard & Monitoring solution, merging manufacturer provided S.M.A.R.T metrics with real-world failure rates.**

> NOTE: Scrutiny is a Work-in-Progress and still has some rough edges.
### Features

Scrutiny is a simple but focused application, with a couple of core features:

- Web UI Dashboard - focused on Critical metrics
- `smartd` integration (no re-inventing the wheel)
- Auto-detection of all connected hard-drives
- S.M.A.R.T metric tracking for historical trends
- Customized thresholds using real world failure rates
- Temperature tracking
- Provided as an all-in-one Docker image (but can be installed manually)
- Configurable Alerting/Notifications via Webhooks
- (Future) Hard Drive performance testing & tracking


**Поставляемая версия:** 0.8.1~ynh2

## Снимки экрана

![Снимок экрана Scrutiny](./doc/screenshots/dashboard.png)

## Документация и ресурсы

- Официальная документация администратора: <https://github.com/AnalogJ/scrutiny/tree/master/docs>
- Репозиторий кода главной ветки приложения: <https://github.com/AnalogJ/scrutiny>
- Магазин YunoHost: <https://apps.yunohost.org/app/scrutiny>
- Сообщите об ошибке: <https://github.com/YunoHost-Apps/scrutiny_ynh/issues>

## Информация для разработчиков

Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing).

Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:

```bash
sudo yunohost app install https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing --debug
или
sudo yunohost app upgrade scrutiny -u https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing --debug
```

**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
4 changes: 2 additions & 2 deletions README_zh_Hans.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# YunoHost 上的 Scrutiny

[![集成程度](https://dash.yunohost.org/integration/scrutiny.svg)](https://dash.yunohost.org/appci/app/scrutiny) ![工作状态](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)
[![集成程度](https://dash.yunohost.org/integration/scrutiny.svg)](https://ci-apps.yunohost.org/ci/apps/scrutiny/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/scrutiny.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/scrutiny.maintain.svg)

[![使用 YunoHost 安装 Scrutiny](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scrutiny)

Expand Down Expand Up @@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
- (Future) Hard Drive performance testing & tracking


**分发版本:** 0.8.1~ynh1
**分发版本:** 0.8.1~ynh2

## 截图

Expand Down
11 changes: 5 additions & 6 deletions manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ id = "scrutiny"
name = "Scrutiny"
description.en = "WebUI for smartd S.M.A.R.T monitoring"

version = "0.8.1~ynh1"
version = "0.8.1~ynh2"

maintainers = ["ewilly"]

Expand All @@ -15,7 +15,8 @@ code = "https://github.com/AnalogJ/scrutiny"
fund = "https://paypal.me/analogj/usd10"

[integration]
yunohost = ">= 11.2"
yunohost = ">= 11.2.18"
helpers_version = "2.1"
architectures = ["amd64", "arm64"]
multi_instance = false
ldap = "not_relevant"
Expand All @@ -41,7 +42,7 @@ ram.runtime = "50M"
[resources]
[resources.sources]

[resources.sources.main]
[resources.sources.scrutiny-web-linux]
in_subdir = false
rename = "scrutiny-web-linux"
amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.8.1/scrutiny-web-linux-amd64"
Expand All @@ -55,6 +56,7 @@ ram.runtime = "50M"

[resources.sources.scrutiny-collector-metrics-linux]
in_subdir = false
rename = "scrutiny-collector-metrics-linux"
amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.8.1/scrutiny-collector-metrics-linux-amd64"
amd64.sha256 = "904056ddc4e0bd3455a0db45d56f98084135a967eef018d18bfc8e4c0ef6887e"
arm64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.8.1/scrutiny-collector-metrics-linux-arm64"
Expand All @@ -75,9 +77,6 @@ ram.runtime = "50M"
[resources.system_user]

[resources.install_dir]
dir = "/var/www/__APP__"
owner = "__APP__:rwx"
group = "__APP__:rx"

[resources.permissions]
main.url = "/"
Expand Down
26 changes: 8 additions & 18 deletions scripts/_common.sh
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
#!/bin/bash

#=================================================
# COMMON VARIABLES
#=================================================
ynh_arch="$YNH_ARCH"

#=================================================
# PERSONAL HELPERS
# COMMON VARIABLES AND CUSTOM HELPERS
#=================================================

myynh_set_permissions () {
chown -R $app: "$install_dir"
chmod 750 "$install_dir"
chmod -R o-rwx "$install_dir"
chmod -R +x "$install_dir/bin/"
}

#=================================================
# EXPERIMENTAL HELPERS
#=================================================
chown -R $app: "$install_dir"
chmod u=rwX,g=rX,o= "$install_dir"
chmod -R o-rwx "$install_dir"
chmod -R +x "$install_dir/bin/"

#=================================================
# FUTURE OFFICIAL HELPERS
#=================================================
chown $app:root "/var/log/$app"
chmod -R u=rwX,g=rX,o= "/var/log/$app"
}
Loading

0 comments on commit 6ef4d16

Please sign in to comment.