From f49213ed056341fce993065c442b74829b5d6c0e Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sun, 20 Nov 2022 15:24:43 +0100 Subject: [PATCH] Align with updates from @scavara Co-Authored-By: scavara <1292351+scavara@users.noreply.github.com> --- scrutiny/CHANGELOG.md | 2 ++ scrutiny/config.json | 10 ++++++---- scrutiny/rootfs/etc/cont-init.d/01-configuration.sh | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scrutiny/CHANGELOG.md b/scrutiny/CHANGELOG.md index a22ecbaea..b81ab3b74 100644 --- a/scrutiny/CHANGELOG.md +++ b/scrutiny/CHANGELOG.md @@ -1,7 +1,9 @@ +- New options SMARTCTL_COMMAND_DEVICE_TYPE & SMARTCTL_MEGARAID_DISK_NUM (@scavara) - New option, define COLLECTOR_API_ENDPOINT when in Collector mode - New option "Mode" : Collector+WebUI or Collector only ## v0.5.0 (26-08-2022) + - Update to latest version from analogj/scrutiny - BACKUP BEFORE UPDATE : major version change diff --git a/scrutiny/config.json b/scrutiny/config.json index ec55adb79..1a3a4752f 100644 --- a/scrutiny/config.json +++ b/scrutiny/config.json @@ -73,10 +73,12 @@ "COLLECTOR_API_ENDPOINT": "str?", "Mode": "list(Collector+WebUI|Collector)?", "TZ": "str?", - "Updates": "list(Hourly|Daily|Weekly)" + "Updates": "list(Hourly|Daily|Weekly)", + "SMARTCTL_COMMAND_DEVICE_TYPE": "list(auto|ata|scsi|sat|usbcypress|usbjmicron|usbsunplus|marvell|megaraid)?", + "SMARTCTL_MEGARAID_DISK_NUM": "int?" }, - "slug": "scrutiny", + "slug": "scrutiny_fa", "udev": true, "url": "https://github.com/AnalogJ/scrutiny", - "version": "v0.5.0-3" -} + "version": "v0.5.0-5" +} \ No newline at end of file diff --git a/scrutiny/rootfs/etc/cont-init.d/01-configuration.sh b/scrutiny/rootfs/etc/cont-init.d/01-configuration.sh index 4572747ce..24985bf69 100644 --- a/scrutiny/rootfs/etc/cont-init.d/01-configuration.sh +++ b/scrutiny/rootfs/etc/cont-init.d/01-configuration.sh @@ -56,6 +56,7 @@ case "$FREQUENCY" in sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * 0\"" /etc/cont-init.d/50-cron-config ;; esac + ############################ # SMARTCTL COMMAND OPTIONS # ############################