mirror of
https://github.com/YunoHost-Apps/netdata_ynh.git
synced 2024-09-03 19:46:33 +02:00
Merge pull request #55 from YunoHost-Apps/testing
This commit is contained in:
JimboJoe
GitHub
commit
8173e3dc78
9 changed files with 21 additions and 47 deletions
|
|
@ -4,6 +4,11 @@ Changelog
|
|||
## Unreleased
|
||||
- Nothing for now...
|
||||
|
||||
## [1.28.0~ynh1](https://github.com/YunoHost-Apps/netdata_ynh/pull/50) - 2020-12-19
|
||||
|
||||
#### Changed
|
||||
* [Update to 1.28.0](https://github.com/YunoHost-Apps/netdata_ynh/pull/50)
|
||||
|
||||
## [1.26.0~ynh1](https://github.com/YunoHost-Apps/netdata_ynh/pull/50) - 2020-11-15
|
||||
|
||||
#### Changed
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ NetData for YunoHost
|
|||
---------------------
|
||||
|
||||
[](https://ci-apps.yunohost.org/jenkins/job/netdata%20%28Community%29/lastBuild/consoleFull)  
|
||||
[](https://install-app.yunohost.org/?app=netdata)
|
||||
[](https://install-app.yunohost.org/?app=netdata)
|
||||
|
||||
[NetData](http://my-netdata.io/) is a system for **distributed real-time performance and health monitoring**.
|
||||
It provides **unparalleled insights, in real-time**, of everything happening on the
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@
|
|||
wrong_user=0
|
||||
wrong_path=1
|
||||
change_url=1
|
||||
;;; Levels
|
||||
Level 5=auto
|
||||
# https://github.com/YunoHost-Apps/netdata_ynh/issues/4
|
||||
;;; Options
|
||||
Email=
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.26.0/netdata-v1.26.0.tar.gz
|
||||
SOURCE_SUM=33af27eb57f954e50059a32bec624815aa742fe03182845b1d9b577f1e20e30a
|
||||
SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.28.0/netdata-v1.28.0.tar.gz
|
||||
SOURCE_SUM=44801e240b1883a98d203156397cc8d9232492f3136891e61074e2e7facbf1a8
|
||||
SOURCE_FORMAT=tar.gz
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"en": "real-time performance and health monitoring",
|
||||
"fr": "Monitoring serveur en temps reel"
|
||||
},
|
||||
"version": "1.26.0~ynh1",
|
||||
"version": "1.28.0~ynh1",
|
||||
"url": "http://my-netdata.io/",
|
||||
"license": "GPL-3.0",
|
||||
"maintainer": {
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
"url": ""
|
||||
},
|
||||
"requirements": {
|
||||
"yunohost": ">= 3.7.0"
|
||||
"yunohost": ">= 3.8.1"
|
||||
},
|
||||
"multi_instance": false,
|
||||
"services": [
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ ynh_abort_if_errors
|
|||
#=================================================
|
||||
# LOAD SETTINGS
|
||||
#=================================================
|
||||
ynh_script_progression --message="Loading installation settings..." --weight=1
|
||||
ynh_print_info --message="Loading installation settings..."
|
||||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
|
|
@ -34,46 +34,20 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
|
|||
#=================================================
|
||||
# STANDARD BACKUP STEPS
|
||||
#=================================================
|
||||
|
||||
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
|
||||
|
||||
#=================================================
|
||||
# STOP SYSTEMD SERVICE
|
||||
#=================================================
|
||||
ynh_print_info --message="Stopping a systemd service..."
|
||||
|
||||
ynh_systemd_action --service_name=$app --action="stop" --log_path="$final_path/var/log/$app/error.log"
|
||||
|
||||
#=================================================
|
||||
# BACKUP THE APP MAIN DIR
|
||||
#=================================================
|
||||
ynh_print_info --message="Backing up Netdata configuration directory..."
|
||||
|
||||
ynh_backup --src_path="$final_path/etc/netdata"
|
||||
|
||||
#=================================================
|
||||
# BACKUP THE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_print_info --message="Backing up nginx web server configuration..."
|
||||
|
||||
ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC BACKUP
|
||||
#=================================================
|
||||
|
||||
#=================================================
|
||||
# START SYSTEMD SERVICE
|
||||
#=================================================
|
||||
ynh_print_info --message="Starting a systemd service..."
|
||||
|
||||
ynh_systemd_action --service_name=$app --action="start" --log_path="$final_path/var/log/$app/error.log"
|
||||
|
||||
#=================================================
|
||||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ ynh_add_nginx_config
|
|||
# SPECIFIC SETUP
|
||||
#=================================================
|
||||
|
||||
ynh_script_progression --message="Executing Netdata installer..." --weight=180
|
||||
ynh_script_progression --message="Executing Netdata installer..." --weight=30
|
||||
|
||||
# create a temporary file for the log
|
||||
tmp=$(mktemp /tmp/netdata-updater-log-XXXXXX.log)
|
||||
|
|
@ -128,7 +128,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2
|
|||
# Start a systemd service
|
||||
ynh_systemd_action --service_name=$app --action="restart" --log_path="$final_path/var/log/$app/error.log"
|
||||
|
||||
|
||||
#=================================================
|
||||
# SETUP SSOWAT
|
||||
#=================================================
|
||||
|
|
@ -144,7 +143,6 @@ fi
|
|||
# Add direct access in the portal to admin only
|
||||
ynh_permission_update --permission "main" --add "$admin"
|
||||
|
||||
|
||||
#=================================================
|
||||
# RELOAD NGINX
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ ynh_install_app_dependencies $pkg_dependencies
|
|||
# INSTALL AND RESTORE THE APP CONFIGURATION
|
||||
#=================================================
|
||||
|
||||
ynh_script_progression --message="Reinstalling Netdata..." --weight=180
|
||||
ynh_script_progression --message="Reinstalling Netdata..." --weight=18
|
||||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
NETDATA_TMPDIR=$(mktemp -d)
|
||||
|
|
@ -87,7 +87,7 @@ configure_netdata
|
|||
# INTEGRATE SERVICE IN YUNOHOST
|
||||
#=================================================
|
||||
|
||||
yunohost service add $app --description "A short description of the app" --log "$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log"
|
||||
yunohost service add $app --description "Real-time performance and health monitoring for systems and applications" --log "$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log"
|
||||
|
||||
#=================================================
|
||||
# START SYSTEMD SERVICE
|
||||
|
|
|
|||
|
|
@ -69,13 +69,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
|
||||
path_url=$(ynh_normalize_url_path --path_url=$path_url)
|
||||
|
||||
#=================================================
|
||||
# STANDARD UPGRADE STEPS
|
||||
#=================================================
|
||||
|
|
@ -86,7 +79,7 @@ path_url=$(ynh_normalize_url_path --path_url=$path_url)
|
|||
|
||||
if [ "$upgrade_type" == "UPGRADE_APP" ]
|
||||
then
|
||||
ynh_script_progression --message="Upgrading source files..." --weight=180
|
||||
ynh_script_progression --message="Upgrading source files..." --weight=18
|
||||
|
||||
#=================================================
|
||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||
|
|
@ -141,6 +134,12 @@ ynh_install_app_dependencies $pkg_dependencies
|
|||
# GENERIC FINALIZATION
|
||||
#=================================================
|
||||
|
||||
#=================================================
|
||||
# INTEGRATE SERVICE IN YUNOHOST
|
||||
#=================================================
|
||||
|
||||
yunohost service add $app --description "Real-time performance and health monitoring for systems and applications" --log "$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log"
|
||||
|
||||
#=================================================
|
||||
# SETUP SSOWAT
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue