Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New packages #15

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

New packages #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
15f7d03
Add new packages to plg.
SimonFair Aug 26, 2023
f4d52a3
Fix md5
SimonFair Aug 26, 2023
8cb3faa
Fix MD5
SimonFair Aug 26, 2023
4325db1
Fix
SimonFair Aug 26, 2023
bb7b2d8
Create test load for upgrade testing.
SimonFair Aug 27, 2023
b888a95
Update nut-2.8.0.plg
SimonFair Aug 28, 2023
e8c9b3a
Update nut-2.8.0.plg
SimonFair Aug 28, 2023
ee90b1a
Update packages
SimonFair Aug 28, 2023
4c51f35
Update nut.plg
SimonFair Aug 28, 2023
2792822
Package Update to 2.8.0
SimonFair Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions plugin/nut-2.8.0.plg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!DOCTYPE PLUGIN [
<!ENTITY name "nut">
<!ENTITY author "SimonFair">
<!ENTITY version "2023.07.26">
<!ENTITY version "2023.08.26">
<!ENTITY launch "Settings/NUTsettings">
<!ENTITY gitURL "https://raw.githubusercontent.com/&author;/NUT-unRAID/master">
<!ENTITY pluginURL "&gitURL;/plugin/&name;-2.8.0.plg">
Expand All @@ -17,7 +17,8 @@

<CHANGES>
##&name;
###2023.07.26
###2023.08.26
- Update packages to 2.8.0
###2023.07.26
- fix: reduce console spam of copy operations by redirecting output to /dev/null, as requested in 2023.07.21 #3 (comment)
- fix: stop services before a plugin upgrade on the live system to remove any file locks preventing files from getting patched on the running instance. a reboot should now no longer be required for all changes>
Expand Down Expand Up @@ -189,12 +190,17 @@ dependency files
<!--
The 'nut-package' file.
-->
<FILE Name="&plgPATH;/nut-2.8.0-x86_64-1.txz" Min="6.10" Run="upgradepkg --install-new">
<URL>&pkgURL;/nut-2.8.0-x86_64-1.txz</URL>
<MD5>2c7a37ac49a3c752536b7f4f43777cc2</MD5>
<FILE Name="&plgPATH;/nut-2.8.0-x86_64-2.txz" Min="6.13" >
<URL>&pkgURL;/nut-2.8.0-x86_64-2.ssl3.txz</URL>
<MD5>f49b17d960920c6970ad3787a55811f6</MD5>
</FILE>

<FILE Name="&plgPATH;/nut-2.8.0-x86_64-2.txz" Min="6.10" Max="6.12.99" >
<URL>&pkgURL;/nut-2.8.0-x86_64-2.ssl11.txz</URL>
<MD5>50c1fde33e3bb0fe398697bf1e212f75</MD5>
</FILE>

<FILE Name="&plgPATH;/nut-2.7.4.20200318-x86_64-1.txz" Min="6.8" Run="upgradepkg --install-new">
<FILE Name="&plgPATH;/nut-2.7.4.20200318-x86_64-1.txz" Min="6.8" Max ="6.9.99" Run="upgradepkg --install-new">
<URL>&pkgURL;/nut-2.7.4.20200318-x86_64-1.txz</URL>
<MD5>52de2867d6b8f6bc1a98a45870b05420</MD5>
</FILE>
Expand Down Expand Up @@ -248,6 +254,7 @@ fi
if [ "$SERVICE" == "enable" ]; then
/etc/rc.d/rc.nut start
fi
rm -f /tmp/start_&name;
</INLINE>
</FILE>

Expand Down Expand Up @@ -297,21 +304,20 @@ else
ln -sf /var/run/upsmon.pid /var/run/nut/upsmon.pid
fi

# Stop service
#echo "stopping services..."
#/etc/rc.d/rc.nut stop 2>/dev/null

# Upgrade Nut package to latest 2.8
upgradepkg --install-new &plgPATH;/nut-2.8.0-x86_64-2.txz

# upgrade plugin package
upgradepkg --install-new &plgPATH;/&plgNAME;.txz

# Stop service
echo "stopping services..."
/etc/rc.d/rc.nut stop 2>/dev/null

# start network ups tools
echo "checking network ups tools configuration..."
at -M -f /tmp/start_&name; now 2>/dev/null

sleep 1

rm -f /tmp/start_&name;

# Cleaning old plugin source files
find &plgPATH;/ -type f -iname "&name;-plugin*.txz" ! -iname "*&version;*" -delete
find &plgPATH;/ -type f -iname "&name;-plugin*.md5" ! -iname "*&version;*" -delete
Expand All @@ -321,7 +327,8 @@ else
echo " &name; has been installed."
echo " Copyright 2015, macester"
echo " Copyright 2020, gfjardim"
echo " Copyright 2015-2022, &author;"
echo " Copyright 2015-2022, Dmacias"
echo " Copyright 2022-2023, &author;"
echo " Version: &version;"
echo "-----------------------------------------------------------"
echo ""
Expand Down Expand Up @@ -366,7 +373,8 @@ echo "-----------------------------------------------------------"
echo " &name; has been removed."
echo " Copyright 2015, macester"
echo " Copyright 2020, gfjardim"
echo " Copyright 2017-2022, &author;"
echo " Copyright 2015-2022, Dmacias"
echo " Copyright 2022-2023, &author;"
echo " Version: &version;"
echo "-----------------------------------------------------------"
echo ""
Expand Down
75 changes: 59 additions & 16 deletions plugin/nut.plg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!DOCTYPE PLUGIN [
<!ENTITY name "nut">
<!ENTITY author "SimonFair">
<!ENTITY version "2023.07.26">
<!ENTITY version "2023.08.26">
<!ENTITY launch "Settings/NUTsettings">
<!ENTITY gitURL "https://raw.githubusercontent.com/&author;/NUT-unRAID/master">
<!ENTITY pluginURL "&gitURL;/plugin/&name;.plg">
Expand All @@ -17,9 +17,11 @@

<CHANGES>
##&name;
###2023.08.26
- Update packages to 2.8.0
###2023.07.26
- fix: reduce console spam of copy operations by redirecting output to /dev/null, as requested in 2023.07.21 #3 (comment)
- fix: stop services before a plugin upgrade on the live system to remove any file locks preventing files from getting patched on the running instance. a reboot should now no longer be required for all changes to become active.
- fix: stop services before a plugin upgrade on the live system to remove any file locks preventing files from getting patched on the running instance. a reboot should now no longer be required for all changes>
- fix: old installation remnants cause updating or transitioning to another nut package on running instance to fail
- fix: fix a permissions issue causing some drivers in 2.8.0 not to have access to their required folders
- new: add button for users to be able to save their UPS details into a dummy-ups compliant diagnostics file
Expand All @@ -34,20 +36,20 @@
- simplification of realpower/apparent power if value set manually
- used   to separate number and unit (W/VA)
- remove obsolete lowbatt fail-safe
Thanks to forum member Peuuuur Noel and Rysz for the PRs.
Thanks to forum member Peuuuur Noel and Rysz for the PRs.
###2023.07.23a
- fix: updated code for better calculation and display (in settings/footer/dashboard) between apparent power, real/true power and data available from NUT
- add: display power factor in settings page
- add: use ups.realpower if available

Thanks to forum member Peuuuur Noel for the PR.
Thanks to forum member Peuuuur Noel for the PR.
###2023.07.22
- fix: persist config files when rebooting
- add: implement lowbatt event fail-safe in settings
- add: always pull-in latest config files on reinstall/upgrade
- add: implement battery replacement notification in settings

Thanks to forum member Rysz for the PR.
Thanks to forum member Rysz for the PR.
###2023.06.03
- Add Small footer style thanks ich777 for the PR.
###2023.02.14
Expand Down Expand Up @@ -188,7 +190,17 @@ dependency files
<!--
The 'nut-package' file.
-->
<FILE Name="&plgPATH;/nut-2.7.4.20200318-x86_64-1.txz" Min="6.8" Run="upgradepkg --install-new">
<FILE Name="&plgPATH;/nut-2.8.0-x86_64-2.txz" Min="6.13" >
<URL>&pkgURL;/nut-2.8.0-x86_64-2.ssl3.txz</URL>
<MD5>f49b17d960920c6970ad3787a55811f6</MD5>
</FILE>

<FILE Name="&plgPATH;/nut-2.8.0-x86_64-2.txz" Min="6.10" Max="6.12.99" >
<URL>&pkgURL;/nut-2.8.0-x86_64-2.ssl11.txz</URL>
<MD5>50c1fde33e3bb0fe398697bf1e212f75</MD5>
</FILE>

<FILE Name="&plgPATH;/nut-2.7.4.20200318-x86_64-1.txz" Min="6.8" Max ="6.9.99" Run="upgradepkg --install-new">
<URL>&pkgURL;/nut-2.7.4.20200318-x86_64-1.txz</URL>
<MD5>52de2867d6b8f6bc1a98a45870b05420</MD5>
</FILE>
Expand All @@ -203,6 +215,11 @@ The 'nut-package' file.
<MD5>24702ef930855db3432ed9ee73e93d42</MD5>
</FILE>

<FILE Name="&plgPATH;/net-snmp-5.9.3-x86_64-1.txz" Min="6.10" Run="upgradepkg --install-new">
<URL>&pkgURL;/net-snmp-5.9.3-x86_64-1.txz</URL>
<MD5>5beebc819894c94bedbc531d47cfe497</MD5>
</FILE>

<FILE Name="&plgPATH;/net-snmp-5.7.3-x86_64-4.txz" Min="6.1" Run="upgradepkg --install-new">
<URL>&pkgURL;/net-snmp-5.7.3-x86_64-4.txz</URL>
<MD5>b9ef68216b97cb5f0bcd9f3312e5941e</MD5>
Expand Down Expand Up @@ -235,6 +252,7 @@ fi
if [ "$SERVICE" == "enable" ]; then
/etc/rc.d/rc.nut start
fi
rm -f /tmp/start_&name;
</INLINE>
</FILE>

Expand Down Expand Up @@ -265,21 +283,39 @@ else
/etc/rc.d/rc.nut stop 2>/dev/null
fi

# upgrade plugin package
upgradepkg --install-new &plgPATH;/&plgNAME;.txz
# nut-2.7.4 and nut plugin expects:
# Config: /etc/nut
# Pid : /var/run/nut/upsmon.pid

# nut-2.8.0 expects
# Config: /etc/ups
# Pid : /var/run/upsmon.pid

if [ ! -d /etc/nut ]; then
# Link nut-2.8.0 config to nut-2.7.4 config
mkdir /etc/nut
cp -f /etc/ups/* /etc/nut
rm -rf /etc/ups
ln -sf /etc/nut /etc/ups
# Link nut-2.7.4 pid to nut-2.8.0 pid
mkdir /var/run/nut
ln -sf /var/run/upsmon.pid /var/run/nut/upsmon.pid
fi

# Stop service
echo "stopping services..."
/etc/rc.d/rc.nut stop 2>/dev/null
#echo "stopping services..."
#/etc/rc.d/rc.nut stop 2>/dev/null

# Upgrade Nut package to latest 2.8
upgradepkg --install-new &plgPATH;/nut-2.8.0-x86_64-2.txz

# upgrade plugin package
upgradepkg --install-new &plgPATH;/&plgNAME;.txz

# start network ups tools
echo "checking network ups tools configuration..."
at -M -f /tmp/start_&name; now 2>/dev/null

sleep 1

rm -f /tmp/start_&name;

# Cleaning old plugin source files
find &plgPATH;/ -type f -iname "&name;-plugin*.txz" ! -iname "*&version;*" -delete
find &plgPATH;/ -type f -iname "&name;-plugin*.md5" ! -iname "*&version;*" -delete
Expand All @@ -289,7 +325,8 @@ else
echo " &name; has been installed."
echo " Copyright 2015, macester"
echo " Copyright 2020, gfjardim"
echo " Copyright 2015-2022, &author;"
echo " Copyright 2015-2022, Dmacias"
echo " Copyright 2022-2023, &author;"
echo " Version: &version;"
echo "-----------------------------------------------------------"
echo ""
Expand Down Expand Up @@ -318,6 +355,11 @@ rm -rf &plgPATH;/ups
rm -f &plgPATH;/*.txz \
&plgPATH;/*.md5

# Remove links for nut-2.8.0 vs nut-2.7.4
rm -rf /etc/nut
rm -f /etc/ups
rm -rf /var/run/nut

# clean up folders after the removed installation
# in case of re-installation of package on live system
rm -rf /etc/nut
Expand All @@ -329,7 +371,8 @@ echo "-----------------------------------------------------------"
echo " &name; has been removed."
echo " Copyright 2015, macester"
echo " Copyright 2020, gfjardim"
echo " Copyright 2017-2022, &author;"
echo " Copyright 2015-2022, Dmacias"
echo " Copyright 2022-2023, &author;"
echo " Version: &version;"
echo "-----------------------------------------------------------"
echo ""
Expand Down