YunoHost-Apps/monitorix_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/monitorix_ynh.git synced 2024-09-03 19:46:06 +02:00
Code Issues Activity Actions

Merge branch 'testing' into master

Browse source
This commit is contained in:
Josué Tille 2020-12-03 21:55:25 +01:00
commit 38daa172c5
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
9 changed files with 33 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,7 +1,7 @@
Monitorix For yunohost Monitorix For yunohost
====================== ======================
[![Integration level](https://dash.yunohost.org/integration/monitorix.svg)](https://ci-apps.yunohost.org/ci/apps/monitorix%20%28Community%29/lastBuild/consoleFull) [![Integration level](https://dash.yunohost.org/integration/monitorix.svg)](https://dash.yunohost.org/appci/app/monitorix) ![](https://ci-apps.yunohost.org/ci/badges/monitorix.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/monitorix.maintain.svg)
[![Install monitorix with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=monitorix) [![Install monitorix with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=monitorix)
> *This package allow you to install monitorix quickly and simply on a YunoHost server. > *This package allow you to install monitorix quickly and simply on a YunoHost server.
@ -39,7 +39,7 @@ This app have no specific authentification and no specific user management.
### Supported architectures ### Supported architectures
* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/monitorix%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/monitorix/) * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/monitorix%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/monitorix/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/monitorix%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/monitorix/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/monitorix%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/monitorix/)
<!--Limitations <!--Limitations

11
check_process
View file

@ -22,14 +22,3 @@
port_already_use=1 (8080) port_already_use=1 (8080)
final_path_already_use=1 final_path_already_use=1
change_url=1 change_url=1
;;; Levels
Level 1=auto
Level 2=auto
Level 3=auto
Level 4=na
Level 5=auto
Level 6=auto
Level 7=auto
Level 8=0
Level 9=0
Level 10=0

4
conf/monitorix.conf
View file

@ -473,9 +473,9 @@ secure_log_date_format = %b %e
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
<mysql> <mysql>
conn_type = socket conn_type = socket
list = /var/run/mysqld/mysqld.sock list = /run/mysqld/mysqld.sock
<desc> <desc>
/var/run/mysqld/mysqld.sock = 3306, __MYSQL_USER__, __MYSQL_PASSWORD__ /run/mysqld/mysqld.sock = 3306, __MYSQL_USER__, __MYSQL_PASSWORD__
</desc> </desc>
rigid = 0, 2, 0, 0, 0, 0 rigid = 0, 2, 0, 0, 0, 0
limit = 100, 100, 100, 100, 100, 100 limit = 100, 100, 100, 100, 100, 100

8
scripts/backup
View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ../settings/scripts/experimental_helper.sh
source ../settings/scripts/_common.sh
# Source YunoHost helpers # Source YunoHost helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ../settings/scripts/experimental_helper.sh
source ../settings/scripts/_common.sh
# Retrieve arguments # Retrieve arguments
ynh_script_progression --message="Loading installation settings..." ynh_script_progression --message="Loading installation settings..."
domain=$(ynh_app_setting_get --app $app --key domain) domain=$(ynh_app_setting_get --app $app --key domain)

8
scripts/change_url
View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
# Source YunoHost helpers # Source YunoHost helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
ynh_script_progression --message="Loading installation settings..." ynh_script_progression --message="Loading installation settings..."
# Retrive arguments # Retrive arguments

8
scripts/install
View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
# Source YunoHost helpers # Source YunoHost helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
ynh_script_progression --message="Validating installation parameters..." ynh_script_progression --message="Validating installation parameters..."
# Retrieve arguments # Retrieve arguments

6
scripts/remove
View file

@ -4,9 +4,6 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Source YunoHost helpers
source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
set -u set -u
@ -14,6 +11,9 @@ set -u
source ./experimental_helper.sh source ./experimental_helper.sh
source ./_common.sh source ./_common.sh
# Source YunoHost helpers
source /usr/share/yunohost/helpers
ynh_script_progression --message="Loading installation settings..." ynh_script_progression --message="Loading installation settings..."

11
scripts/restore
View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ../settings/scripts/experimental_helper.sh
source ../settings/scripts/_common.sh
# Source YunoHost helpers # Source YunoHost helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ../settings/scripts/experimental_helper.sh
source ../settings/scripts/_common.sh
ynh_script_progression --message="Loading settings..." ynh_script_progression --message="Loading settings..."
# Retrieve old app settings # Retrieve old app settings
@ -55,6 +55,9 @@ ynh_restore
ynh_script_progression --message="Protecting directory..." ynh_script_progression --message="Protecting directory..."
set_permission set_permission
# register yunohost service
yunohost service add monitorix
# Reload nginx # Reload nginx
systemctl reload nginx.service systemctl reload nginx.service

11
scripts/upgrade
View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
# Source YunoHost helpers # Source YunoHost helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
ynh_script_progression --message="Loading installation settings..." ynh_script_progression --message="Loading installation settings..."
# Retrieve app settings # Retrieve app settings
@ -68,6 +68,9 @@ ynh_secure_remove --file=/usr/share/yunohost/hooks/post_iptable_rules/50-$app
ynh_script_progression --message="Protecting directory..." ynh_script_progression --message="Protecting directory..."
set_permission set_permission
# register yunohost service
yunohost service add monitorix
# Reload monitorix # Reload monitorix
# While we stop monitorix sometime the built-in web server is not stopped cleanly. So are sure that everything is cleanly stoped by that # While we stop monitorix sometime the built-in web server is not stopped cleanly. So are sure that everything is cleanly stoped by that
# So this fix that # So this fix that