fix formatting

This commit is contained in:
dmacias72 2016-09-16 14:39:44 -06:00
parent b2b74383d7
commit 51fdfcea9c
7 changed files with 332 additions and 144 deletions

View File

@ -7,10 +7,10 @@
<!ENTITY launch "Settings/&name;">
<!ENTITY gitURL "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
<!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY plgpath "/boot/config/plugins/&name;">
<!ENTITY plgname "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
<!ENTITY plgname "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
]>
<PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;">
@ -48,7 +48,7 @@
- add check for other plugin dependencies on uninstall
###2016.01.25
- Merge eschultz pull request
- tweaks to tablesorter to restore saved filters
- tweaks to tablesorter to restore saved filters
- minor optimizations
###2016.01.24
- Merged eschultz's package repo and following fixes
@ -197,31 +197,31 @@ fi
sum1=$(/usr/bin/md5sum &plgpath;/&plgname;.txz)
sum2=$(/usr/bin/cat &plgpath;/&plgname;.md5)
if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
echo "Wrong 'plugin' package md5 hash."
rm &plgpath;/&plgname;.txz \
&plgpath;/&plgname;.md5
exit 1
echo "Wrong 'plugin' package md5 hash."
rm &plgpath;/&plgname;.txz \
&plgpath;/&plgname;.md5
exit 1
else
if [ ! -d &plgpath;/packages/$VER ]; then
mkdir &plgpath;/packages/$VER
fi
if [ ! -d &plgpath;/packages/$VER ]; then
mkdir &plgpath;/packages/$VER
fi
count=`ls -1 /boot/config/plugins/NerdPack/packages/*.txz 2>/dev/null | wc -l`
if [ $count != 0 ]; then
if [ ! -d &plgpath;/packages/6.1 ]; then
mkdir &plgpath;/packages/6.1
fi
echo "Moving package files..."
mv &plgpath;/packages/*txz &plgpath;/packages/6.1
fi
count=`ls -1 /boot/config/plugins/NerdPack/packages/*.txz 2>/dev/null | wc -l`
if [ $count != 0 ]; then
if [ ! -d &plgpath;/packages/6.1 ]; then
mkdir &plgpath;/packages/6.1
fi
echo "Moving package files..."
mv &plgpath;/packages/*txz &plgpath;/packages/6.1
fi
upgradepkg --install-new &plgpath;/&plgname;.txz
upgradepkg --install-new &plgpath;/&plgname;.txz
/usr/sbin/packagemanager
/usr/sbin/packagemanager
# Cleaning old source files
find &plgpath;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
find &plgpath;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
# Cleaning old source files
find &plgpath;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
find &plgpath;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
echo ""
echo "-----------------------------------------------------------"

188
plugins/apache.plg Executable file
View File

@ -0,0 +1,188 @@
<?xml version='1.0' standalone='yes'?>
<!DOCTYPE PLUGIN [
<!ENTITY name "apache">
<!ENTITY author "dmacias72">
<!ENTITY version "2015.09.16">
<!ENTITY launch "Settings/&name;">
<!ENTITY gitURL "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
<!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY plgPATH "/boot/config/plugins/&name;">
<!ENTITY plgNAME "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
]>
<PLUGIN name="&name;" author="&author;" launch="&launch;" version="&version;" pluginURL="&pluginURL;">
<!--
This Plugin installs and controls The Apache HTTP Server ("httpd") for unRaid 6.0 ONLY. All dependencies are installed as needed and is controlable from the webgui.
-->
<CHANGES>
###2016.09.16
- update plugin for 6.2 only
###2015.09.07
- fix start and stop scripts
###2015.09.06
- change image png
- refomat code for markdown and dynamix inherent functions
###2015.08.31
- add full path to settings page POST script
###2015.08.27
- fix plugin remove script
###2015.08.26
- update extensions to php 5.4.44
- updated for unRAID 6.1
###2015.08.20
- fix rc.apache symlink
###2015.08.19
- update apache to 2.4.16
- update extentions to php 5.4.43
- updates for unRAID 6.1-rc* only
###2015.06.06
- update to apache 2.4.12
- update php extensions to 5.4.40
- remove libpng and libjpeg packages will need to reboot
###2015.05.22
- condense code
- use native v6 code and styling
###2015.04.18
- fix bugs
- add version and link to webserver
###2015.04.17
- update extentions to php 5.4.36
- added directory browser
- reformatted layout
###2015.01.31
- update for beta12+
###2014.09.25
- fix install and remove scripts
###2014.09.25
- reformated github and plugin format
- conf files will now be in /boot/config/plugins/apache/httpd
###2014.06.07
- initial commit
</CHANGES>
<FILE Name="/boot/config/plugins/NerdPack/packages/6.2/apr-1.5.2-x86_64-1.txz">
<URL>&gitURL;/packages/6.2/apr-1.5.2-x86_64-1.txz</URL>
<MD5>4076e8b7bd35e028b1cfb9224b51afc8</MD5>
</FILE>
<FILE Name="/boot/config/plugins/NerdPack/packages/6.2/apr-util-1.5.4-x86_64-2.txz">
<URL>&gitURL;/packages/6.2/apr-util-1.5.4-x86_64-2.txz</URL>
<MD5>4efea0ce9975635fe82ad0a6a079d1ca</MD5>
</FILE>
<FILE Name="&pkgs;freetype-2.6.5-x86_64-1.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;freetype-2.6.5-x86_64-1.txz</URL>
<MD5>60eb82ef3458130fc48f07e6f5035876</MD5>
</FILE>
<FILE Name="&pkgs;httpd-2.4.23-x86_64-1.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;httpd-2.4.23-x86_64-1.txz</URL>
<MD5>5a7a6f7ec34f23b88bd60072dcc1add9</MD5>
</FILE>
<FILE Name="&pkgs;libtool-2.4.6-x86_64-4.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;libtool-2.4.6-x86_64-4.txz</URL>
<MD5>3a4d8446f6025bdc06f423d719f942e8</MD5>
</FILE>
<FILE Name="&pkgs;libX11-1.6.3-x86_64-2.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;libX11-1.6.3-x86_64-2.txz</URL>
<MD5>26472fb7e9d86d3127a427f2c364623f</MD5>
</FILE>
<FILE Name="&pkgs;libXau-1.0.8-x86_64-1.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;libXau-1.0.8-x86_64-1.txz</URL>
<MD5>b09a959ee01a1ea1d31600999b05dfef</MD5>
</FILE>
<FILE Name="&pkgs;libxcb-1.11.1-x86_64-1.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;libxcb-1.11.1-x86_64-1.txz</URL>
<MD5>86a2a1c5f8fa01e6c2372d3d957201c4</MD5>
</FILE>
<FILE Name="&pkgs;libXdmcp-1.1.2-x86_64-2.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;libXdmcp-1.1.2-x86_64-2.txz</URL>
<MD5>ce01ef3cc35262bb124d36e2f5c520c5</MD5>
</FILE>
<FILE Name="&pkgs;libXpm-3.5.11-x86_64-1.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;libXpm-3.5.11-x86_64-1.txz</URL>
<MD5>d7e67e2109a8b0e3e554187dcccf3089</MD5>
</FILE>
<FILE Name="&pkgs;net-snmp-5.7.3-x86_64-3.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;net-snmp-5.7.3-x86_64-3.txz</URL>
<MD5>4e5e3b7b73388912e18205ab1f509629</MD5>
</FILE>
<FILE Name="&pkgs;php-ext-5.6.25-x86_64-1.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;php-ext-5.6.25-x86_64-1.txz</URL>
<MD5>b3a04a99ab551b85b690b41c57976ce9</MD5>
</FILE>
<FILE Name="&pkgs;t1lib-5.1.2-x86_64-3.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;t1lib-5.1.2-x86_64-3.txz</URL>
<MD5>6942fb6f9f78b8e3cc4a1c77469a2512</MD5>
</FILE>
<!--
git from github as tarball
-->
<FILE Name="&plugin;/&name;-&version;.tar.gz">
<URL>"https://github.com/&author;/&name;/archive/&version;.tar.gz"</URL>
</FILE>
<!--
The 'install' script.
-->
<FILE Run="/bin/bash">
<INLINE>
if [ ! -d &emhttp; ]; then
mkdir -p &emhttp;
fi
tar -zxf &plugin;/&name;-&version;.tar.gz --strip=1 -C &emhttp;/
find &plugin; -type f -iname "*.tar.gz" ! -iname "&name;-&version;.tar.gz" -delete
chmod +0770 /usr/local/emhttp/plugins/&name;/scripts/*
cp -nr /usr/local/emhttp/plugins/&name;/&name; /boot/config/plugins
if [ ! -L /var/www/htdocs ]; then
mv -T /var/www/htdocs /var/www/html
fi
ln -sfT /var/www/html /srv/httpd/htdocs
rm -rf /etc/httpd
ln -sfT &plugin;/httpd /etc/httpd
</INLINE>
</FILE>
<!--
The 'remove' script.
-->
<FILE Run="/bin/bash" Method="remove">
<INLINE>
/usr/local/emhttp/plugins/&name;/scripts/stop
rm -rf /usr/local/emhttp/plugins/&name;
rm -f &plugin;/&name;-&version;.tar.gz
</INLINE>
</FILE>
<FILE Name="/tmp/apache-chkconf" Run="/bin/bash">
<INLINE>
<![CDATA[
#!/bin/sh
# This will check each entry in the config so nothing is missing, and if missing, sets to default
CFGFILE=/boot/config/plugins/apache/apache.cfg
[ ! `cat "$CFGFILE" | grep SERVICE` ] && echo "SERVICE=\"disable\"" >> "$CFGFILE"
[ ! `cat "$CFGFILE" | grep DOCROOT` ] && echo "DOCROOT=\"/var/www/html\"" >> "$CFGFILE"
[ ! `cat "$CFGFILE" | grep ^PORT` ] && echo "PORT=\"8088\"" >> "$CFGFILE"
[ ! `cat "$CFGFILE" | grep RUNAS` ] && echo "RUNAS=\"nobody\"" >> "$CFGFILE"
rm /tmp/apache-chkconf
]]>
</INLINE>
</FILE>
</PLUGIN>

View File

@ -7,10 +7,10 @@
<!ENTITY launch "Settings/CommandLineSettings">
<!ENTITY gitURL "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
<!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY plgPATH "/boot/config/plugins/&name;">
<!ENTITY plgNAME "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
<!ENTITY plgNAME "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
]>
<PLUGIN name="&name;" author="&author;" launch="&launch;" version="&version;" pluginURL="&pluginURL;">
@ -34,7 +34,7 @@ This Plugin installs and controls shellinabox for unRaid 6.1 All dependencies a
- fix: conform screenfetch OS: to 80 columns (remove brackets)
- condense and restructure code
###2016.02.20
- fix: update plugin ovewriting home directory with saved
- fix: update plugin ovewriting home directory with saved
###2016.02.11a
- fix screenfetch error if emhttp/var.ini were not ready
###2016.02.11
@ -60,8 +60,8 @@ This Plugin installs and controls shellinabox for unRaid 6.1 All dependencies a
- default config file
###2016.01.06
- change package path to plugin directory
- fix Tool/Command Line page
- fix misspelled cfg file
- fix Tool/Command Line page
- fix misspelled cfg file
- fix default port 8088 to 4200
###2015.12.30
- remove old plugin directory on install
@ -143,31 +143,31 @@ fi
sum1=$(/usr/bin/md5sum &plgPATH;/&plgNAME;.txz)
sum2=$(/usr/bin/cat &plgPATH;/&plgNAME;.md5)
if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
echo "Wrong 'plugin' package md5 hash."
rm &plgPATH;/&plgNAME;.txz
rm &plgPATH;/&plgNAME;.md5
exit 1
echo "Wrong 'plugin' package md5 hash."
rm &plgPATH;/&plgNAME;.txz
rm &plgPATH;/&plgNAME;.md5
exit 1
else
#remove old plugin and move old files
OLDPLG="/boot/config/plugins/shellinabox-plugin"
if [ -d /usr/local/emhttp/plugins/shellinabox ]; then
rm -rf /usr/local/emhttp/plugins/shellinabox
fi
if [ -d /usr/local/emhttp/plugins/shellinabox-plugin ]; then
rm -rf /usr/local/emhttp/plugins/shellinabox-plugin
fi
if [ -f $OLDPLG/shellinabox-plugin.cfg ]; then
mv -f $OLDPLG/shellinabox-plugin.cfg &plgPATH;/cmdline.cfg
fi
if [ -f $OLDPLG/home_directory.tar.gz ]; then
mv -f $OLDPLG/home_directory.tar.gz &plgPATH;/home_directory.tar.gz
fi
if [ -d $OLDPLG ]; then
rm -rf $OLDPLG
fi
# upgrade package
upgradepkg --install-new &plgPATH;/&plgNAME;.txz
#remove old plugin and move old files
OLDPLG="/boot/config/plugins/shellinabox-plugin"
if [ -d /usr/local/emhttp/plugins/shellinabox ]; then
rm -rf /usr/local/emhttp/plugins/shellinabox
fi
if [ -d /usr/local/emhttp/plugins/shellinabox-plugin ]; then
rm -rf /usr/local/emhttp/plugins/shellinabox-plugin
fi
if [ -f $OLDPLG/shellinabox-plugin.cfg ]; then
mv -f $OLDPLG/shellinabox-plugin.cfg &plgPATH;/cmdline.cfg
fi
if [ -f $OLDPLG/home_directory.tar.gz ]; then
mv -f $OLDPLG/home_directory.tar.gz &plgPATH;/home_directory.tar.gz
fi
if [ -d $OLDPLG ]; then
rm -rf $OLDPLG
fi
# upgrade package
upgradepkg --install-new &plgPATH;/&plgNAME;.txz
# start shellinabox daemon
/etc/rc.d/rc.shellinaboxd startup

View File

@ -29,8 +29,8 @@
- fix: workaround for dynamix plugin update api not refreshing after update (remove update message)
- fix: workaround for dynamix drop down checklists bug (F5 on other tab breaks ddcl)
- fix: refresh Settings tab on tab1 click for ddcl bug
- fix: check for board manufacturer
- add: remove auto board.json update and add manual Check for Updates button
- fix: check for board manufacturer
- add: remove auto board.json update and add manual Check for Updates button
- add: update fan logging: add start/stop messages and fan speed changes are in the form Fan Name(%):Temp Sensor(°C)
- add: ignored sensors to fan control page
- add: ignored sensors and command line arguments to CL helper scripts: ipmisensors, ipmisel and ipmifru
@ -267,47 +267,47 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
&plgPATH;/&plgNAME;.md5
exit 1
else
if [[ $VER == 6.1 ]]; then
echo "\nInstalling dependencies for unRAID 6.1"
rm &plgPATH;/freeipmi-1.5.1-x86_64-1.txz
upgradepkg --install-new &plgPATH;/freeipmi-1.4.11-x86_64-3.txz
fi
if [[ $VER == 6.1 ]]; then
echo "\nInstalling dependencies for unRAID 6.1"
rm &plgPATH;/freeipmi-1.5.1-x86_64-1.txz
upgradepkg --install-new &plgPATH;/freeipmi-1.4.11-x86_64-3.txz
fi
if [[ $VER == 6.2 ]]; then
echo "\nInstalling dependencies for unRAID 6.2"
rm &plgPATH;/freeipmi-1.4.11-x86_64-3.txz
upgradepkg --install-new &plgPATH;/freeipmi-1.5.1-x86_64-1.txz
fi
if [[ $VER == 6.2 ]]; then
echo "\nInstalling dependencies for unRAID 6.2"
rm &plgPATH;/freeipmi-1.4.11-x86_64-3.txz
upgradepkg --install-new &plgPATH;/freeipmi-1.5.1-x86_64-1.txz
fi
upgradepkg --install-new &plgPATH;/&plgNAME;.txz
upgradepkg --install-new &plgPATH;/&plgNAME;.txz
# Load impi drivers
echo "checking ipmi drivers..."
for module in ipmi_msghandler ipmi_devintf ipmi_si; do
modprobe $module
done
# Load impi drivers
echo "checking ipmi drivers..."
for module in ipmi_msghandler ipmi_devintf ipmi_si; do
modprobe $module
done
# Start scripts if enabled
<![CDATA[
echo "checking ipmi event monitor..."
/etc/rc.d/rc.ipmiseld start >/dev/null 2>&1 < /dev/null &
sleep 1
echo "checking ipmi system log tail..."
setsid /etc/rc.d/rc.ipmitail start >/dev/null 2>&1 < /dev/null &
sleep 1
echo "checking ipmi fan control..."
setsid /usr/sbin/ipmifan --quit &
sleep 1
setsid /usr/sbin/ipmifan --daemon &
sleep 1
echo "checking ipmi sensors configuration..."
setsid /etc/rc.d/rc.ipmicfg commit &
sleep 1
]]>
# Start scripts if enabled
<![CDATA[
echo "checking ipmi event monitor..."
/etc/rc.d/rc.ipmiseld start >/dev/null 2>&1 < /dev/null &
sleep 1
echo "checking ipmi system log tail..."
setsid /etc/rc.d/rc.ipmitail start >/dev/null 2>&1 < /dev/null &
sleep 1
echo "checking ipmi fan control..."
setsid /usr/sbin/ipmifan --quit &
sleep 1
setsid /usr/sbin/ipmifan --daemon &
sleep 1
echo "checking ipmi sensors configuration..."
setsid /etc/rc.d/rc.ipmicfg commit &
sleep 1
]]>
# Cleaning old source files
find &plgPATH;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
find &plgPATH;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
# Cleaning old source files
find &plgPATH;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
find &plgPATH;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
echo ""
echo "-----------------------------------------------------------"
@ -343,11 +343,11 @@ removepkg &plgPATH;/*.txz
rm -rf &emhttp;
rm -f &plgPATH;/*.txz \
&plgPATH;/*.md5
echo "unloading ipmi drivers..."
for module in ipmi_msghandler ipmi_devintf ipmi_si; do
modprobe -r $module
modprobe -r $module
done
echo ""
echo "-----------------------------------------------------------"

View File

@ -7,10 +7,10 @@
<!ENTITY launch "Settings/VMSettings">
<!ENTITY gitURL "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
<!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY plgpath "/boot/config/plugins/&name;">
<!ENTITY plgname "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
<!ENTITY plgname "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
]>
<PLUGIN name="&name;" author="&author;" launch="&launch;" version="&version;" pluginURL="&pluginURL;">
@ -59,7 +59,7 @@ This Plugin installs libvirt wake on lan for unRaid 6.1 All dependencies are in
###2015.11.17
- fix start and stop event permissions
###2015.11.16
- added promiscuous mode to listen for all packets
- added promiscuous mode to listen for all packets
- will recieve all ether proto 0x0842 packets now
###2015.11.15
- added support for ethertype 0x0842
@ -123,7 +123,7 @@ The 'plugin' package MD5 hash.
The 'install' script.
-->
<FILE Run="/bin/bash">
<INLINE>
<INLINE>
#Verify unRAID Version
source /etc/unraid-version
VER=${version:0:3}
@ -142,34 +142,34 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
rm &plgpath;/&plgname;.md5
exit 1
else
if [[ $VER == 6.1 ]]; then
echo "\nInstalling dependencies for unRAID 6.1"
upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.9-x86_64-1.txz
upgradepkg --install-new &plgpath;/libvirt-python-1.2.18-x86_64-1ponce.txz
fi
if [[ $VER == 6.1 ]]; then
echo "\nInstalling dependencies for unRAID 6.1"
upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.9-x86_64-1.txz
upgradepkg --install-new &plgpath;/libvirt-python-1.2.18-x86_64-1ponce.txz
fi
if [[ $VER == 6.2 ]]; then
echo "\nInstalling dependencies for unRAID 6.2"
upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.12-x86_64-1.txz
upgradepkg --install-new &plgpath;/libvirt-python-1.3.1-x86_64-1ponce.txz
if [[ $VER == 6.2 ]]; then
echo "\nInstalling dependencies for unRAID 6.2"
upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.12-x86_64-1.txz
upgradepkg --install-new &plgpath;/libvirt-python-1.3.1-x86_64-1ponce.txz
# restore VM Manager Menu
sed -i -- 's/VMManager:1/OtherSettings/g' /usr/local/emhttp/plugins/dynamix.vm.manager/VMSettings.page
fi
# restore VM Manager Menu
sed -i -- 's/VMManager:1/OtherSettings/g' /usr/local/emhttp/plugins/dynamix.vm.manager/VMSettings.page
fi
upgradepkg --install-new &plgpath;/&plgname;.txz
upgradepkg --install-new &plgpath;/&plgname;.txz
#restart event daemon
<![CDATA[
/usr/local/emhttp/plugins/libvirtwol/scripts/stop >/dev/null 2>&1 < /dev/null &
sleep 1
echo "starting libvirtwol..."
setsid /usr/local/emhttp/plugins/libvirtwol/scripts/start >/dev/null 2>&1 < /dev/null &
]]>
#restart event daemon
<![CDATA[
/usr/local/emhttp/plugins/libvirtwol/scripts/stop >/dev/null 2>&1 < /dev/null &
sleep 1
echo "starting libvirtwol..."
setsid /usr/local/emhttp/plugins/libvirtwol/scripts/start >/dev/null 2>&1 < /dev/null &
]]>
# Cleaning old source files
find &plgpath;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
find &plgpath;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
# Cleaning old source files
find &plgpath;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete
find &plgpath;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete
echo ""
echo "-----------------------------------------------------------"

View File

@ -7,11 +7,11 @@
<!ENTITY launch "Settings/SpeedtestSettings">
<!ENTITY gitURL "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
<!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY pkgs "/boot/packages">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY pkgs "/boot/packages">
<!ENTITY plgpath "/boot/config/plugins/&name;">
<!ENTITY plgname "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
<!ENTITY plgname "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
]>
<PLUGIN name="&name;" author="&author;" launch="&launch;" version="&version;" pluginURL="&pluginURL;">
@ -62,7 +62,7 @@ This Plugin installs speedtest-cli for unRaid 6.1 All dependencies are installe
- fix: chart and table sync on changes
- fix: filters save
- fix: page refresh after manual test
- fix: various minor css and code
- fix: various minor css and code
- add settings icon
- removed stacked charts
- add: persistent chart selection cookie
@ -109,7 +109,7 @@ This Plugin installs speedtest-cli for unRaid 6.1 All dependencies are installe
- save sort and filter settings
- added default cfg
###2015.12.29
- update tablesorter to v2.25.0 combined
- update tablesorter to v2.25.0 combined
- add tablesorter filters to table
- save speedtest host server
- add shadow box display when running speedtest
@ -120,7 +120,7 @@ This Plugin installs speedtest-cli for unRaid 6.1 All dependencies are installe
- Speedtest Cron Settings under Settings/Scheduler
- Speedtest App under Tools/Speedtest
###2015.12.20
- added speedtest-xml script to /usr/sbin/ for cron jobs
- added speedtest-xml script to /usr/sbin/ for cron jobs
- added logging to speedtest.php for start and completion of the script
###2015.12.19
- changed icon thanks to hernandito
@ -221,15 +221,15 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
rm &plgpath;/&plgname;.md5
exit 1
else
if [[ $VER == 6.1 ]]; then
echo "\nInstalling dependencies for unRAID 6.1"
upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.9-x86_64-1.txz
fi
if [[ $VER == 6.1 ]]; then
echo "\nInstalling dependencies for unRAID 6.1"
upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.9-x86_64-1.txz
fi
if [[ $VER == 6.2 ]]; then
echo "\nInstalling dependencies for unRAID 6.2"
upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.12-x86_64-1.txz
fi
if [[ $VER == 6.2 ]]; then
echo "\nInstalling dependencies for unRAID 6.2"
upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.12-x86_64-1.txz
fi
upgradepkg --install-new &plgpath;/&plgname;.txz

View File

@ -7,10 +7,10 @@
<!ENTITY launch "Settings/Wakeonlan">
<!ENTITY gitURL "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
<!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY plgpath "/boot/config/plugins/&name;">
<!ENTITY plgname "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
<!ENTITY plgname "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
]>
<PLUGIN name="&name;" author="&author;" launch="&launch;" version="&version;" pluginURL="&pluginURL;">
@ -34,7 +34,7 @@
###2015.03.05a
- fix default ethernet interface
###2015.02.24
- button bindings when editing
- button bindings when editing
###2015.02.21
- added autosave
- added table sorting
@ -90,7 +90,7 @@ The 'plugin' package MD5 hash.
The 'install' script.
-->
<FILE Run="/bin/bash">
<INLINE>
<INLINE>
#Verify unRAID Version
source /etc/unraid-version
if [[ ${version:0:3} == 6.0 ]]; then
@ -112,12 +112,12 @@ fi
# remove old plugin name folder
if [ -d /usr/local/emhttp/plugins/wol ]; then
rm -f /usr/local/emhttp/plugins/wol
rm -f /usr/local/emhttp/plugins/wol
fi
# create log directory
if [ ! -d /var/log/&name; ]; then
mkdir -p /var/log/&name;
mkdir -p /var/log/&name;
fi
chmod 755 /var/log/&name;