mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-22 06:09:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change 'unRAID' to 'Unraid' to match new branding.

Browse Source 
Updated a few copyright strings.
This commit is contained in:
Tom Mortensen
2018-08-31 12:58:40 -07:00
parent 56d1f6672c
commit 6668ad0ec5
44 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.apcupsd/LICENSE
+1 -1
View File
@@ -1,6 +1,6 @@
Copyright 2015, by Dan Landon
This plugin provides APCUPSD support for unRAID V6. The plugin was modified from the original
This plugin provides APCUPSD support for Unraid V6. The plugin was modified from the original
work done by seeDrs.
This program is free software; you can redistribute it and/or
plugins/dynamix.apcupsd/apcupsd.notify
+1 -1
View File
@@ -2,4 +2,4 @@
# Send system notify message from apcupsd
#
read MESSAGE
/usr/local/emhttp/webGui/scripts/notify -e "unRAID Server Alert" -s "UPS Alert" -d "$MESSAGE" -i "alert"
/usr/local/emhttp/webGui/scripts/notify -e "Unraid Server Alert" -s "UPS Alert" -d "$MESSAGE" -i "alert"
plugins/dynamix.docker.manager/DockerSettings.page
+1 -1
View File
@@ -29,7 +29,7 @@ if (file_exists($realfile)) {
$realfile = transpose_user_path($realfile);
if (exec("stat -c %T -f " . escapeshellarg($realfile)) == "btrfs") {
if (shell_exec("lsattr " . escapeshellarg($realfile) . " | grep \"\\-C\"") == "") {
echo '<p class="notice">Your existing Docker image file needs to be recreated due to an issue from an earlier beta of unRAID 6. Failure to do so may result in your docker image suffering corruption at a later time. Please do this NOW!</p>';
echo '<p class="notice">Your existing Docker image file needs to be recreated due to an issue from an earlier beta of Unraid 6. Failure to do so may result in your docker image suffering corruption at a later time. Please do this NOW!</p>';
}
}
}
plugins/dynamix.docker.manager/LICENSE
+2 -2
View File
@@ -7,6 +7,6 @@ FORKED FROM:
This Software is licensed under [GPL version 2](http://www.gnu.org/licenses/gpl-2.0.html).
unRAID is a registered trademark of [Lime Technology](http://lime-technology.com).
Unraid is a registered trademark of [Lime Technology, Inc.](http://lime-technology.com).
This file shall be included in all copies or substantial portions of the Software.
This file shall be included in all copies or substantial portions of the Software.
plugins/dynamix.docker.manager/include/CreateDocker.php
+3 -3
View File
@@ -228,13 +228,13 @@ if ($_GET['xmlTemplate']) {
if ($arrConfig['Type'] == 'Path' && strtolower($arrConfig['Target']) == '/unraid') {
$arrConfig['Default'] = $arrConfig['Value'] = realpath($dockercfg['DOCKER_APP_UNRAID_PATH']);
$arrConfig['Display'] = 'hidden';
$arrConfig['Name'] = 'unRAID Share Path';
$arrConfig['Name'] = 'Unraid Share Path';
$boolFound = true;
}
}
if (!$boolFound) {
$xml['Config'][] = [
'Name' => 'unRAID Share Path',
'Name' => 'Unraid Share Path',
'Target' => '/unraid',
'Default' => realpath($dockercfg['DOCKER_APP_UNRAID_PATH']),
'Value' => realpath($dockercfg['DOCKER_APP_UNRAID_PATH']),
@@ -735,7 +735,7 @@ span.cpu,label.checkbox{display:inline-block;width:32px}
<tr>
<td colspan="2">
<blockquote class="inline_help">
<p>Templates are a quicker way to setting up Docker Containers on your unRAID server. There are two types of templates:</p>
<p>Templates are a quicker way to setting up Docker Containers on your Unraid server. There are two types of templates:</p>
<p>
<b>Default templates</b><br>
plugins/dynamix.docker.manager/include/Helpers.php
+1 -1
View File
@@ -257,7 +257,7 @@ function xmlToCommand($xml, $create_paths=false) {
// Bind Time
$Variables[] = 'TZ="' . $var['timeZone'] . '"';
// Add HOST_OS variable
$Variables[] = 'HOST_OS="unRAID"';
$Variables[] = 'HOST_OS="Unraid"';
foreach ($xml['Config'] as $key => $config) {
$confType = strtolower(strval($config['Type']));
plugins/dynamix.plugin.manager/Update.page
+1 -1
View File
@@ -92,6 +92,6 @@ $(function() {
<thead><tr><th></th><th>Component</th><th>Author</th><th>Version</th><th>Status</th><th>Branch</th></tr></thead>
<tbody id="os_list"><?=$empty?></tbody>
<?if ($bzroot):?>
<tbody id="previous" style="display:none"><tr><td><img src="/plugins/unRAIDServer/images/unRAIDServer.png"></td><td><b>unRAID Server OS (previous)</b></td><td>LimeTech</td><td><?=$version?></td><td><input type="button" value="Restore" onclick="downgrade()"></td><td><?=$branch?></td></tbody>
<tbody id="previous" style="display:none"><tr><td><img src="/plugins/unRAIDServer/images/unRAIDServer.png"></td><td><b>Unraid OS (previous)</b></td><td>LimeTech</td><td><?=$version?></td><td><input type="button" value="Restore" onclick="downgrade()"></td><td><?=$branch?></td></tbody>
<?endif;?>
</table>
plugins/dynamix.plugin.manager/scripts/plugin
+11 -11
View File
@@ -249,15 +249,15 @@ function plugin($method, $plugin_file, &$error) {
if (!in_array($method, explode(" ", $file->attributes()->Method))) continue;
} elseif ($method != "install") continue;
$name = $file->attributes()->Name;
// bergware - check unRAID version dependency (if present)
// bergware - check Unraid version dependency (if present)
$min = $file->attributes()->Min;
if ($min && version_compare($unraid['version'],$min,'<')) {
echo "plugin: skipping: ".basename($name)." - unRAID version too low, requires at least version $min\n";
echo "plugin: skipping: ".basename($name)." - Unraid version too low, requires at least version $min\n";
continue;
}
$max = $file->attributes()->Max;
if ($max && version_compare($unraid['version'],$max,'>')) {
echo "plugin: skipping: ".basename($name)." - unRAID version too high, requires at most version $max\n";
echo "plugin: skipping: ".basename($name)." - Unraid version too high, requires at most version $max\n";
continue;
}
// Name can be missing but only makes sense if Run attribute is present
@@ -453,17 +453,17 @@ if ($method == "install") {
}
} else
$plugin_file = realpath($argv[2]);
// bergware - check unRAID version dependency (if present)
// bergware - check Unraid version dependency (if present)
$min = plugin("min", $plugin_file, $error);
if ($min && version_compare($unraid['version'],$min,'<')) {
echo "plugin: installed unRAID version is too low, require at least version $min\n";
echo "plugin: installed Unraid version is too low, require at least version $min\n";
exit(1);
}
$max = plugin("max", $plugin_file, $error);
if (empty($max))
$max = plugin("unRAID", $plugin_file, $error);
$max = plugin("Unraid", $plugin_file, $error);
if ($max && version_compare($unraid['version'],$max,'>')) {
echo "plugin: installed unRAID version is too high, require at most version $max\n";
echo "plugin: installed Unraid version is too high, require at most version $max\n";
exit(1);
}
$plugin = basename($plugin_file);
@@ -611,17 +611,17 @@ if ($method == "update") {
echo "plugin: $plugin_file does not exist, check for updates first\n";
exit (1);
}
// bergware - check unRAID version dependency (if present)
// bergware - check Unraid version dependency (if present)
$min = plugin("min", $plugin_file, $error);
if ($min && version_compare($unraid['version'],$min,'<')) {
echo "plugin: installed unRAID version is too low, require at least version $min\n";
echo "plugin: installed Unraid version is too low, require at least version $min\n";
exit(1);
}
$max = plugin("max", $plugin_file, $error);
if (empty($max))
$max = plugin("unRAID", $plugin_file, $error);
$max = plugin("Unraid", $plugin_file, $error);
if ($max && version_compare($unraid['version'],$max,'>')) {
echo "plugin: installed unRAID version is too high, require at most version $max\n";
echo "plugin: installed Unraid version is too high, require at most version $max\n";
exit(1);
}
// install the updated plugin
plugins/dynamix.vm.manager/VMSettings.page
+1 -1
View File
@@ -24,7 +24,7 @@ require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
$strLoadedModules = shell_exec("/etc/rc.d/rc.libvirt test");
if (empty($strLoadedModules)) {
echo "<p class='notice'>Your hardware does not have Intel VT-x or AMD-V capability. This is required to create VMs in KVM.";
echo "<a href='http://lime-technology.com/wiki/index.php/UnRAID_Manual_6#Hardware-Assisted_Virtualization_.28HVM.29' target='_blank'> Click here to see the unRAID Wiki for more information</a></p>";
echo "<a href='http://lime-technology.com/wiki/index.php/UnRAID_Manual_6#Hardware-Assisted_Virtualization_.28HVM.29' target='_blank'> Click here to see the Unraid Wiki for more information</a></p>";
echo "<input type='button' value='Done' onclick='done()'>";
exit;
}
plugins/dynamix.vm.manager/templates/Custom.form.php
+8 -8
View File
@@ -766,14 +766,14 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
?>
<table class="domain_os other" data-category="Share" data-multiple="true" data-minimum="1" data-index="<?=$i?>" data-prefix="<?=$strLabel?>">
<tr class="advanced">
<td>unRAID Share:</td>
<td>Unraid Share:</td>
<td>
<input type="text" data-pickfolders="true" data-pickfilter="NO_FILES_FILTER" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrShare['source'])?>" name="shares[<?=$i?>][source]" placeholder="e.g. /mnt/user/..." title="path of unRAID share" />
<input type="text" data-pickfolders="true" data-pickfilter="NO_FILES_FILTER" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrShare['source'])?>" name="shares[<?=$i?>][source]" placeholder="e.g. /mnt/user/..." title="path of Unraid share" />
</td>
</tr>
<tr class="advanced">
<td>unRAID Mount tag:</td>
<td>Unraid Mount tag:</td>
<td>
<input type="text" value="<?=htmlspecialchars($arrShare['target'])?>" name="shares[<?=$i?>][target]" placeholder="e.g. shares (name of mount tag inside vm)" title="mount tag inside vm" />
</td>
@@ -784,12 +784,12 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<div class="advanced">
<blockquote class="inline_help">
<p>
<b>unRAID Share</b><br>
<b>Unraid Share</b><br>
Used to create a VirtFS mapping to a Linux-based guest. Specify the path on the host here.
</p>
<p>
<b>unRAID Mount tag</b><br>
<b>Unraid Mount tag</b><br>
Specify the mount tag that you will use for mounting the VirtFS share inside the VM. See this page for how to do this on a Linux-based guest: <a href="http://wiki.qemu.org/Documentation/9psetup" target="_blank">http://wiki.qemu.org/Documentation/9psetup</a>
</p>
@@ -802,14 +802,14 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<script type="text/html" id="tmplShare">
<table class="domain_os other">
<tr class="advanced">
<td>unRAID Share:</td>
<td>Unraid Share:</td>
<td>
<input type="text" data-pickfolders="true" data-pickfilter="NO_FILES_FILTER" data-pickroot="/mnt/" value="" name="shares[{{INDEX}}][source]" placeholder="e.g. /mnt/user/..." title="path of unRAID share" />
<input type="text" data-pickfolders="true" data-pickfilter="NO_FILES_FILTER" data-pickroot="/mnt/" value="" name="shares[{{INDEX}}][source]" placeholder="e.g. /mnt/user/..." title="path of Unraid share" />
</td>
</tr>
<tr class="advanced">
<td>unRAID Mount tag:</td>
<td>Unraid Mount tag:</td>
<td>
<input type="text" value="" name="shares[{{INDEX}}][target]" placeholder="e.g. shares (name of mount tag inside vm)" title="mount tag inside vm" />
</td>
plugins/dynamix.vm.manager/templates/LibreELEC.form.php
+1 -1
View File
@@ -514,7 +514,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<tr>
<td>Config Folder:</td>
<td>
<input type="text" data-pickfolders="true" data-pickfilter="NO_FILES_FILTER" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrConfig['shares'][0]['source'])?>" name="shares[0][source]" placeholder="e.g. /mnt/user/appdata/libreelec" title="path on unRAID share to save LibreELEC settings" required/>
<input type="text" data-pickfolders="true" data-pickfilter="NO_FILES_FILTER" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrConfig['shares'][0]['source'])?>" name="shares[0][source]" placeholder="e.g. /mnt/user/appdata/libreelec" title="path on Unraid share to save LibreELEC settings" required/>
<input type="hidden" value="<?=htmlspecialchars($arrConfig['shares'][0]['target'])?>" name="shares[0][target]" />
</td>
</tr>
plugins/dynamix.vm.manager/templates/OpenELEC.form.php
+1 -1
View File
@@ -516,7 +516,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<tr>
<td>Config Folder:</td>
<td>
<input type="text" data-pickfolders="true" data-pickfilter="NO_FILES_FILTER" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrConfig['shares'][0]['source'])?>" name="shares[0][source]" placeholder="e.g. /mnt/user/appdata/openelec" title="path on unRAID share to save OpenELEC settings" required/>
<input type="text" data-pickfolders="true" data-pickfilter="NO_FILES_FILTER" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrConfig['shares'][0]['source'])?>" name="shares[0][source]" placeholder="e.g. /mnt/user/appdata/openelec" title="path on Unraid share to save OpenELEC settings" required/>
<input type="hidden" value="<?=htmlspecialchars($arrConfig['shares'][0]['target'])?>" name="shares[0][target]" />
</td>
</tr>
plugins/dynamix/AFP.page
+2 -2
View File
@@ -40,7 +40,7 @@ Connected users:
</form>
> ### Overview
> AFP for unRAID includes both `netatalk` to implement Apple Filing Protocol, and `avahi`
> AFP for Unraid includes both `netatalk` to implement Apple Filing Protocol, and `avahi`
> to implement Zeroconf, aka, Bonjour.
>
> As with SMB and NFS, you may export both disk shares and user shares via AFP. There are some important
@@ -54,7 +54,7 @@ Connected users:
> * The netatalk documentation includes a strong warning to not use symlinks anywhere in a file system
> being exprted via AFP.
>
> AFP for unRAID supports Time Machine, and all three security modes.
> AFP for Unraid supports Time Machine, and all three security modes.
>
> ### Bonjour
> When AFP is enabled, your server name, with a `-AFP` suffix, should automatically appear in the left-hand pane of
plugins/dynamix/ArrayDevices.page
+1 -1
View File
@@ -126,7 +126,7 @@ if ($display['total']) echo "<tr class='tr_last'><td colspan='11'>&nbsp;</td></t
>
> The Array must be Stopped in order to change Array device assignments.
>
> An unRAID array consists of a single Parity disk and a number of Data disks. The Data
> An Unraid array consists of a single Parity disk and a number of Data disks. The Data
> disks are exclusively used to store user data, and the Parity disk provides the redundancy necessary
> to recover from any singe disk failure.
>
plugins/dynamix/ArrayOperation.page
+5 -5
View File
@@ -336,7 +336,7 @@ $(function(){
<td>Cannot contact key-server. Please check your <a href="/Settings/NetworkSettings">network settings</a>.</td></tr>
<? elseif ($var['configValid']=="withdrawn"):?>
<tr><td><?status_indicator()?><span class="strong big">Stopped.</span></td><td><input type="submit" name="cmdStart" value="Start" disabled></td>
<td>This unRAID Server OS release has been withdrawn and may no longer be used. Please <a href="/Plugins">update</a> your server.</td></tr>
<td>This Unraid OS release has been withdrawn and may no longer be used. Please <a href="/Plugins">update</a> your server.</td></tr>
<? else:
switch ($var['mdState']):
case "STOPPED":
@@ -501,7 +501,7 @@ enable_stop();
<?if ($var['fsState'] == "Stopped"):?>
> #### Assigning Devices
>
> An unRAID disk array consists of a single parity disk and a number of data disks. The data
> An Unraid disk array consists of a single parity disk and a number of data disks. The data
> disks are exclusively used to store user data, and the parity disk provides the redundancy necessary
> to recover from any singe disk failure.
>
@@ -518,7 +518,7 @@ enable_stop();
>
> #### Requirements
>
> Unlike traditional RAID systems which stripe data across all the array devices, an unRAID server
> Unlike traditional RAID systems which stripe data across all the array devices, an Unraid server
> stores files on individual hard drives. Consequently, all file write operations will involve both the
> data disk the file is being written to, and the parity disk. For these reasons,
>
@@ -530,13 +530,13 @@ enable_stop();
>
> #### Guidelines
>
> Here are the steps you should follow when designing your unRAID disk array:
> Here are the steps you should follow when designing your Unraid disk array:
>
> 1. Decide which hard drive you will use for parity, and which hard drives you will use for
> data disk1, disk2, etc., and label them in some fashion. Also, find the serial number of each hard
> drive and jot it down somewhere; you will need this information later.
>
> 2. Install your hard drive devices, boot unRAID Server and bring up the webGui. If this is a fresh system
> 2. Install your hard drive devices, boot Unraid OS and bring up the webGui. If this is a fresh system
> build, then the Main page will show no disks installed. This doesn't mean the system can't detect your
> hard drives; it just means that none have been assigned yet.
>
plugins/dynamix/CacheDevices.page
+3 -3
View File
@@ -52,8 +52,8 @@ endforeach;
>
> <img src='/webGui/images/grey-off.png' class='icon'>No device present, position is empty.
>
> **Cache** is a device, or device pool, *outside* the unRAID array. It may be exported for network access just
> like an Array device. Being outside the unRAID array results in significantly faster write access.
> **Cache** is a device, or device pool, *outside* the Unraid array. It may be exported for network access just
> like an Array device. Being outside the Unraid array results in significantly faster write access.
>
> There are two ways to configure the Cache:
>
@@ -64,7 +64,7 @@ endforeach;
> or xfs). This configuration offers the highest performance, but at the cost of no data protection - if the
> single Cache device fails all data contained on it may be lost.
>
> When configured as a multi-device pool, unRAID OS will automatically select *btrfs-raid1* format (for both data
> When configured as a multi-device pool, Unraid OS will automatically select *btrfs-raid1* format (for both data
> and meta-data). btrfs permits any number of devices to be added to the pool and each copy of data is guaranteed
> to be written to two different devices. Hence the pool can withstand a single-disk failure without losing data.
>
plugins/dynamix/Credits.page
+5 -5
View File
@@ -2,25 +2,25 @@ Menu="About"
Title="Credits"
Tag="diamond"
---
**unRAID webGUI** Copyright &copy; 2005-2017, [Lime Technology, Inc.](http://lime-technology.com).
**Unraid webGUI** Copyright &copy; 2005-2018, [Lime Technology, Inc.](http://lime-technology.com).
**Dynamix** Copyright &copy; 2012-2017, Bergware International.
**Dynamix** Copyright &copy; 2012-2018, Bergware International.
**Extended Docker Configuration Page** Copyright &copy; 2014-2017, Guilherme Jardim.
**VM Manager** Copyright &copy; 2015-2017, Eric Schultz, Derek Macias.
**VM Manager** Copyright &copy; 2015-2018, Eric Schultz, Derek Macias.
**APC UPS Configuration Page** Copyright &copy; 2015, Dan Landon.
**Simple Features** Copyright &copy; 2012, Andrew Hamer-Adams.
The Software comprising the unRAID webGui, which is all files within this repository except for
The Software comprising the Unraid webGui, which is all files within this repository except for
files listed below, is licensed under GPL version 2.
* The Lime Technology logo file(s) `webGui/images/limetech-*.*` are property of Lime Technology, Inc.
and may not be used in any other project without written permission from Lime Technology, Inc.
**unRAID**&reg; is a registered trademark of [Lime Technology, Inc.](http://lime-technology.com).
**Unraid**&reg; is a registered trademark of [Lime Technology, Inc.](http://lime-technology.com).
This file shall be included in all copies or substantial portions of the Software.
plugins/dynamix/DeviceInfo.page
+1 -1
View File
@@ -301,7 +301,7 @@ btrfs balance status:
> Without any options specified a "full balance" is performed which will basically rewrite everything in the filesystem.
> The run time is potentially very long, depending on the filesystem size.
>
> unRAID uses these default options when creating a multiple-device pool:
> Unraid uses these default options when creating a multiple-device pool:
>
> `-dconvert=raid1 -mconvert=raid1`
>
plugins/dynamix/Diagnostics.page
+2 -2
View File
@@ -44,7 +44,7 @@ function diagnostics() {
<div class="spinner" style="display:none"></div>
<div id="pleaseWait" style="display:none;font-weight:bold;color:red;text-align:center;margin:0">Please wait... collecting diagnostic information (this may take several minutes)</div>
This utility is used for troubleshooting purposes. It will collect all of the system information and configuration files, and package these files in a single ZIP file which can be saved locally.
Subsequently, this file can be included in your correspondence with Limetech or the unRAID forum.
Subsequently, this file can be included in your correspondence with Limetech or the Unraid forum.
This will help others to quickly get the inside information of your system and provide better support to your problem. The following information
and configuration files are collected:
@@ -71,7 +71,7 @@ and configuration files are collected:
Clicking **Download** will start the collection process and then instruct your browser to save the zip file locally.
*No personal information such as user names, passwords, or any other file contents not specified above is included
by unRAID Server OS; however, your server name, IP address, and user share names* **will** *be included.*
by Unraid OS; however, your server name, IP address, and user share names* **will** *be included.*
*Note that 3rd-party plugins **may** or may not store personal information in plugin-specific configuration files and/or output
to the system log.*
plugins/dynamix/DiskSettings.page
+1 -1
View File
@@ -172,7 +172,7 @@ Tunable (md_sync_window):
Tunable (md_sync_thresh):
: <input type="text" name="md_sync_thresh" maxlength="10" value="<?=$var['md_sync_thresh']?>" class="narrow"><?=$var['md_sync_thresh_status']?>
> These tunables let you control certain properties of the unRAID driver.
> These tunables let you control certain properties of the Unraid driver.
>
> Note: For each of these settings, if you set to blank and click Apply, the setting is restored to its default.
plugins/dynamix/FTP.page
+1 -1
View File
@@ -58,6 +58,6 @@ FTP user(s):
> ### Overview
>
> unRAID includes the popular `vsftpd` FTP server. The configuration of `vsftp` is currently very
> Unraid includes the popular `vsftpd` FTP server. The configuration of `vsftp` is currently very
> simple: **All** user names entered above are permitted to access the server via FTP and will have
> *full read/write/delete access* to the entire server, so use with caution.
plugins/dynamix/MoverSettings.page
+1 -1
View File
@@ -31,7 +31,7 @@ $days = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday']
$(function() {
presetMover(document.mover_schedule);
});
// Fool unRAID by simulating the original input field
// Fool Unraid by simulating the original input field
function prepareMover(form) {
var mode = form.shareMoverSchedule.value;
var min = mode!=0 ? form.min.value : 0;
plugins/dynamix/NetworkRules.page
+2 -2
View File
@@ -73,9 +73,9 @@ Interface <?=$eth?>:
: <input type="submit" value="Apply" disabled><input type="button" value="Done" onclick="done()">
</form>
> The interface assignment rules can be changed here and might be necessary to set the preferred interface for managing unRAID - *use with care, usually there is no need to change*.
> The interface assignment rules can be changed here and might be necessary to set the preferred interface for managing Unraid - *use with care, usually there is no need to change*.
>
> **eth0** is the main interface used to manage the unRAID system. The other interfaces are optional and may be used as desired.
> **eth0** is the main interface used to manage the Unraid system. The other interfaces are optional and may be used as desired.
> Every interface must be uniquely identified by its MAC (hardware) address.
>
> The interface assignment is stored on the flash device under */config/network-rules.cfg*. This file can be viewed with any editor, but it is recommended to make changes via the webGUI only.<br>
plugins/dynamix/NewPerms.page
+1 -1
View File
@@ -47,7 +47,7 @@ $(function() {
<?endif;?>
});
</script>
This is a mandatory one-time action to be taken after upgrading from a pre-5.0 unRAID server release to unRAID v5 or a later release.
This is a mandatory one-time action to be taken after upgrading from a pre-5.0 Unraid server release to Unraid v5 or a later release.
Select **ALL DISKS** when performing this one-time action.
This utility is also useful for restoring default ownership/permissions on files and
plugins/dynamix/Notifications.page
+3 -3
View File
@@ -158,7 +158,7 @@ System notifications:
> By default the notifications system is disabled. Enable it here to start receiving notifications.
> The following sections give more options about which and what type of notifications will be sent.
unRAID OS update notification:
Unraid OS update notification:
: <select name="unraidos" size="1" onchange="prepareUnraid(this.value)">
<?=mk_option($notify['unraidos'], "", "Never check")?>
<?=mk_option($notify['unraidos'], "11 */6 * * *", "Check four times a day")?>
@@ -168,7 +168,7 @@ unRAID OS update notification:
<?=mk_option($notify['unraidos'], "11 0 1 * *", "Check once a month")?>
</select>
> Start a periodic verification and notify the user when a new version of the unRAID OS system is detected.
> Start a periodic verification and notify the user when a new version of the Unraid OS system is detected.
> Use the checkboxes below to select how notifications need to be given; by browser, by email and/or by custom agent.
Plugins update notification:
@@ -213,7 +213,7 @@ Array status notification:
> Start a periodic array health check (preventive maintenance) and notify the user the result of this check.
<span id="unraidTitle" class="unraid" style="display:none">&nbsp;</span>
: <span class="unraid" style="display:none"><span style="display:inline-block;width:130px;font-style:italic">unRAID OS update</span>
: <span class="unraid" style="display:none"><span style="display:inline-block;width:130px;font-style:italic">Unraid OS update</span>
<input type="checkbox" name="unraid1"<?=($notify['unraid'] & 1)==1 ? ' checked' : ''?>>Browser &nbsp;
<input type="checkbox" name="unraid2"<?=($notify['unraid'] & 2)==2 ? ' checked' : ''?>>Email &nbsp;
<input type="checkbox" name="unraid3"<?=($notify['unraid'] & 4)==4 ? ' checked' : ''?>>Agents &nbsp;</span>
plugins/dynamix/README.md
+1 -1
View File
@@ -1,5 +1,5 @@
**Dynamix webGui**
The *Dynamix* webGui is the latest iteration of the unRAID Server OS System
The *Dynamix* webGui is the latest iteration of the Unraid OS System
Management Utility. Built upon *Simple Features*, it provides real-time
screen updates, tabbed viewing and many more enhancements.
plugins/dynamix/Registration.page
+10 -10
View File
@@ -34,7 +34,7 @@ div.remark{padding:0 10px;text-align:justify;}
<form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
<input type="hidden" name="TrialGUID" value="<?=$var['flashGUID']?>">
<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">
<span class="thanks">Thank you for trying unRAID Server OS!</span>
<span class="thanks">Thank you for trying Unraid OS!</span>
<div markdown="1" class="remark">
Your server will not be usable until you purchase a Registration key or install a free 30-day *Trial* key. A *Trial*
key provides all the functionality of a *Pro* Registration key.
@@ -71,7 +71,7 @@ Flash GUID:
<form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
<input type="hidden" name="TrialGUID" value="<?=$var['flashGUID']?>">
<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">
<span class="thanks">Thank you for trying unRAID Server OS!</span>
<span class="thanks">Thank you for trying Unraid OS!</span>
<div markdown="1" class="remark">
Your *Trial* key includes all the functionality and device support of a *Pro* Registration key.
@@ -104,7 +104,7 @@ Flash GUID:
<form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
<input type="hidden" name="TrialGUID" value="<?=$var['flashGUID']?>">
<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">
<span class="thanks">Thank you for trying unRAID Server OS!</span>
<span class="thanks">Thank you for trying Unraid OS!</span>
<div markdown="1" class="remark">
<span class='red-text'>Cannot connect to key-server!</span>
@@ -135,7 +135,7 @@ Flash GUID:
<form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
<input type="hidden" name="TrialGUID" value="<?=$var['flashGUID']?>">
<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">
<span class="thanks">Thank you for trying unRAID Server OS!</span>
<span class="thanks">Thank you for trying Unraid OS!</span>
<div markdown="1" class="remark">
<span class='red-text'>Release has been withdrawn!</span>
@@ -166,11 +166,11 @@ Flash GUID:
<form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
<input type="hidden" name="TrialGUID" value="<?=$var['flashGUID']?>">
<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">
<span class="thanks">Thank you for trying unRAID Server OS!</span>
<span class="thanks">Thank you for trying Unraid OS!</span>
<div markdown="1" class="remark">
<span class='red-text'>Your *Trial* key has expired.</span>
To continue using unRAID Server OS you may purchase a Registration key. Alternately, you may request a *Trial* extension key.
To continue using Unraid OS you may purchase a Registration key. Alternately, you may request a *Trial* extension key.
Most *Trial* extension requests are processed immediately but please allow up to one business day to receive your *Trial* extension key.
</div>
@@ -198,7 +198,7 @@ Flash GUID:
<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">
<span class='thanks red'>Invalid <em>Trial</em> Installation</span>
<div markdown="1" class="remark">
It is not possible to use a *Trial* key with an existing unRAID OS installation.
It is not possible to use a *Trial* key with an existing Unraid OS installation.
You may purchase a Registration key corresponding to this USB Flash device to continue using this installation.
@@ -235,7 +235,7 @@ Expiration:
<?if ($var['regTy']=="Basic"):?>
<span class="thanks">Thank you for choosing unRAID Server OS!</span>
<span class="thanks">Thank you for choosing Unraid OS!</span>
<div markdown="1" class="remark">
To support more storage devices as your server grows, click Upgrade Key below.
</div>
@@ -265,7 +265,7 @@ Flash GUID:
<?if ($var['regTy']=="Plus"):?>
<span class="thanks">Thank you for choosing unRAID Server OS!</span>
<span class="thanks">Thank you for choosing Unraid OS!</span>
<div markdown="1" class="remark">
To support more storage devices as your server grows, click Upgrade Key below.
</div>
@@ -295,7 +295,7 @@ Flash GUID:
<?if ($var['regTy']=="Pro"):?>
<span class="thanks">Thank you for choosing unRAID Server OS!</span>
<span class="thanks">Thank you for choosing Unraid OS!</span>
Registered to:
: <span class="big"><?=htmlspecialchars($var['regTo'])?></span>
plugins/dynamix/SecurityAFP.page
+1 -1
View File
@@ -97,7 +97,7 @@ Security:
<?=mk_option($sec_afp[$name]['security'], "private", "Private");?>
</select>
> The unRAID AFP implementation supports Guest access and fully supports the three security
> The Unraid AFP implementation supports Guest access and fully supports the three security
> modes: Public, Secure, and Private.
> In general, when you click on your server's icon in Finder, you will be asked to log in as Guest or to
> specify a set of login credentials (user name/password). In order to use Secure or Private security on
plugins/dynamix/ShareEdit.page
+5 -5
View File
@@ -114,7 +114,7 @@ Allocation method:
<?=mk_option($share['allocator'], "mostfree", "Most-free")?>
</select>
> This setting determines how unRAID OS will choose which disk to use when creating a new file or directory:
> This setting determines how Unraid OS will choose which disk to use when creating a new file or directory:
>
> **High-water**
> Choose the lowest numbered disk with free space still above the current *high water mark*. The
@@ -154,9 +154,9 @@ Split level:
> Determines whether a directory is allowed to expand onto multiple disks.
> **Automatically split any directory as required**
> When a new file or subdirectory needs to be created in a share, unRAID OS first chooses which disk
> When a new file or subdirectory needs to be created in a share, Unraid OS first chooses which disk
> it should be created on, according to the configured *Allocation method*. If the parent directory containing
> the new file or or subdirectory does not exist on this disk, then unRAID OS will first create all necessary
> the new file or or subdirectory does not exist on this disk, then Unraid OS will first create all necessary
> parent directories, and then create the new file or subdirectory.
>
> **Automatically split only the top level directory as required**
@@ -167,12 +167,12 @@ Split level:
>
> **Automatically split only the top "N" level directories as required**
> Similar to previous: when a new file or subdirectory is being created, if the parent directory is at level "N",
> and does not exist on the chosen disk, unRAID OS will first create all necessary parent directories. If the
> and does not exist on the chosen disk, Unraid OS will first create all necessary parent directories. If the
> parent directory of the new file or subdirectory is beyond level "N", then the new file or subdirectory is
> created on the same disk where the parent directory exists.
>
> **Manual: do not automatically split directories**
> When a new file or subdirectory needs to be created in a share, unRAID OS will only consider disks where the
> When a new file or subdirectory needs to be created in a share, Unraid OS will only consider disks where the
> parent directory already exists.
Included disk(s):
plugins/dynamix/SmtpSettings.page
+1 -1
View File
@@ -126,7 +126,7 @@ Priority in header:
Email subject prefix:
: <input type="text" name="Subject" value="<?=htmlspecialchars($ssmtp['Subject'])?>">
> Set a prefix for easy recognition of unRAID messages.
> Set a prefix for easy recognition of Unraid messages.
Mail server:
: <input type="text" name="server" value="<?=htmlspecialchars($ssmtp['server'])?>">
plugins/dynamix/UNRAID-OS.page
+1 -1
View File
@@ -1,4 +1,4 @@
Menu="Tools:10"
Type="menu"
Title="unRAID OS"
Title="Unraid OS"
Tag="lemon-o"
plugins/dynamix/default.cfg
+1 -1
View File
@@ -52,7 +52,7 @@ status=""
root=""
RcptTo=""
SetEmailPriority="True"
Subject="unRAID Status: "
Subject="Unraid Status: "
server="smtp.gmail.com"
port="465"
UseTLS="YES"
plugins/dynamix/include/Custom.php
+3 -3
View File
@@ -9,8 +9,8 @@
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* Modified for unRAID of Array2XML Published February 9, 2016 by Jeetendra Singh
* Modified for unRAID of xmlToArray Published August 23, 2012 by Tamlyn Rhodes
* Modified for Unraid of Array2XML Published February 9, 2016 by Jeetendra Singh
* Modified for Unraid of xmlToArray Published August 23, 2012 by Tamlyn Rhodes
*/
class custom {
private static $xml = null;
@@ -129,7 +129,7 @@ class custom {
$data = current($arr);
// store as single or multi array
if (!isset($tags[$node])) {
// specific for unRAID
// specific for Unraid
if (in_array($node,['hostdev','controller'])) $tags[$node][] = $data; else $tags[$node] = $data;
} elseif (is_array($tags[$node]) && array_keys($tags[$node])===range(0, count($tags[$node])-1)) {
$tags[$node][] = $data;
plugins/dynamix/include/DefaultPageLayout.php
+6 -6
View File
@@ -196,8 +196,8 @@ function hideUpgrade(set) {
$.removeCookie('os_upgrade',{path:'/'});
}
function openUpgrade() {
swal({title:'Update unRAID OS',text:'Do you want to update to the new version?',type:'warning',showCancelButton:true},function(){
openBox('/plugins/dynamix.plugin.manager/scripts/plugin&arg1=update&arg2=unRAIDServer.plg','Update unRAID OS',600,900,true);
swal({title:'Update Unraid OS',text:'Do you want to update to the new version?',type:'warning',showCancelButton:true},function(){
openBox('/plugins/dynamix.plugin.manager/scripts/plugin&arg1=update&arg2=unRAIDServer.plg','Update Unraid OS',600,900,true);
});
}
function notifier() {
@@ -412,7 +412,7 @@ default:
echo "<span class='green strong'><i class='fa fa-play-circle'></i> Array Started</span>$progress"; break;
}
echo "</span></span><span id='countdown'></span><span id='user-notice' class='red-text'></span>";
echo "<span id='copyright'>unRAID&reg; webGui &copy;2018, Lime Technology, Inc.";
echo "<span id='copyright'>Unraid&reg; webGui &copy;2018, Lime Technology, Inc.";
echo " <a href='http://lime-technology.com/wiki/index.php/Official_Documentation' target='_blank' title='Online manual'><i class='fa fa-book'></i> manual</a>";
echo "</span></div>";
?>
@@ -529,11 +529,11 @@ $(function() {
<?else:?>
<?$readme = @file_get_contents("$docroot/plugins/unRAIDServer/README.md",false,null,0,20);?>
<?if (strpos($readme,'REBOOT REQUIRED')!==false):?>
showUpgrade('<b>Reboot required</b> to apply unRAID OS update');
showUpgrade('<b>Reboot required</b> to apply Unraid OS update');
<?elseif (strpos($readme,'DOWNGRADE')!==false):?>
showUpgrade('<b>Reboot required</b> to downgrade unRAID OS');
showUpgrade('<b>Reboot required</b> to downgrade Unraid OS');
<?elseif ($version = plugin_update_available('unRAIDServer',true)):?>
showUpgrade('unRAID OS v<?=$version?> is available. <a>Update Now</a>');
showUpgrade('Unraid OS v<?=$version?> is available. <a>Update Now</a>');
<?elseif (!$notify['system']):?>
$('.upgrade_notice').html('System notifications are <b>disabled</b>. Click <a href="/Settings/Notifications" style="cursor:pointer">here</a> to change notification settings.').show();
<?endif;?>
plugins/dynamix/include/Encryption.php
+1 -1
View File
@@ -7,7 +7,7 @@
// info@geocontext.org
// Public domain license
// Adapted by Bergware for use in unRAID
// Adapted by Bergware for use in Unraid
// forced use of hash key
/*
plugins/dynamix/include/NotificationAgents.xml
+4 -4
View File
@@ -19,7 +19,7 @@
-d "user_credentials=$ACCESS_TOKEN" \
-d "notification[title]=$TITLE" \
-d "notification[long_message]=$MESSAGE" \
-d "notification[source_name]=unRAID" \
-d "notification[source_name]=Unraid" \
-d "notification[sound]=bird-1" \
-d "notification[icon_url]=http://i.imgur.com/u63iSL1.png" \
https://new.boxcar.io/api/notifications 2>&1
@@ -30,7 +30,7 @@
<Name>Prowl</Name>
<Variables>
<Variable Help="Get your api key as explained [a href='https://www.prowlapp.com/api_settings.php' target='_blank'][u]here[/u].[/a]" Desc="Api Key" Default="">API_KEY</Variable>
<Variable Help="Application name, e.g., unRAID Server." Desc="Application Name" Default="unRAID Server">APP_NAME</Variable>
<Variable Help="Application name, e.g., Unraid Server." Desc="Application Name" Default="Unraid Server">APP_NAME</Variable>
<Variable Help="Specify the fields which are included in the title of the notification." Desc="Notification Title" Default="$SUBJECT">TITLE</Variable>
<Variable Help="Specify the fields which are included in the message body of the notification." Desc="Notification Message" Default="$DESCRIPTION">MESSAGE</Variable>
</Variables>
@@ -129,7 +129,7 @@
<Name>Notify My Android</Name>
<Variables>
<Variable Help="The API key can be found [a href='https://www.notifymyandroid.com/account.jsp' target='_blank'] [u]here[/u].[/a]" Desc="API key" Default="">API_KEY</Variable>
<Variable Help="Application name, e.g., unRAID Server." Desc="Application Name" Default="unRAID Server">APP_NAME</Variable>
<Variable Help="Application name, e.g., Unraid Server." Desc="Application Name" Default="Unraid Server">APP_NAME</Variable>
<Variable Help="Specify the fields which are included in the title of the notification." Desc="Notification Title" Default="$SUBJECT">TITLE</Variable>
<Variable Help="Specify the fields which are included in the message body of the notification." Desc="Notification Message" Default="$DESCRIPTION">MESSAGE</Variable>
</Variables>
@@ -193,7 +193,7 @@
<Name>Slack</Name>
<Variables>
<Variable Help="Get your WebHook as explained [a href='https://api.slack.com/incoming-webhooks' target='_blank'][u]here[/u].[/a]" Desc="WebHook URL" Default="USE YOUR OWN WEBHOOK VALUE HERE">WEBH_URL</Variable>
<Variable Help="Application name, e.g., unRAID Server." Desc="Application Name" Default="unRAID Server">APP_NAME</Variable>
<Variable Help="Application name, e.g., Unraid Server." Desc="Application Name" Default="Unraid Server">APP_NAME</Variable>
<Variable Help="Specify the fields which are included in the title of the notification." Desc="Notification Title" Default="$SUBJECT">TITLE</Variable>
<Variable Help="Specify the fields which are included in the message body of the notification." Desc="Notification Message" Default="$DESCRIPTION">MESSAGE</Variable>
</Variables>
plugins/dynamix/include/SMTPtest.php
+1 -1
View File
@@ -33,7 +33,7 @@ function PsEnded($pid) {
function PsKill($pid) {
exec("kill -9 $pid");
}
if (PsExecute("$docroot/webGui/scripts/notify -s 'unRAID SMTP Test' -d 'Test message received!' -i 'alert' -t")) {
if (PsExecute("$docroot/webGui/scripts/notify -s 'Unraid SMTP Test' -d 'Test message received!' -i 'alert' -t")) {
$result = exec("tail -3 /var/log/syslog|awk '/sSMTP/ {getline;print}'|cut -d']' -f2|cut -d'(' -f1");
$color = strpos($result, 'Sent mail') ? 'green' : 'red';
echo "Test result<span class='$color'>$result</span>";
plugins/dynamix/include/Wrappers.php
+1 -1
View File
@@ -43,7 +43,7 @@ function plugin_update_available($plugin, $os=false) {
$remote = get_plugin_attr('version', "/tmp/plugins/$plugin.plg");
if (strcmp($remote,$local)>0) {
if ($os) return $remote;
if (!$unraid = get_plugin_attr('unRAID', "/tmp/plugins/$plugin.plg")) return $remote;
if (!$unraid = get_plugin_attr('Unraid', "/tmp/plugins/$plugin.plg")) return $remote;
$server = get_plugin_attr('version', "/var/log/plugins/unRAIDServer.plg");
if (version_compare($server, $unraid, '>=')) return $remote;
}
plugins/dynamix/javascript/dynamix.js
+1 -1
View File
File diff suppressed because one or more lines are too long
plugins/dynamix/javascript/jquery.filedrop.js
+1 -1
View File
@@ -1,3 +1,3 @@
/* jquery-filedrop. Version: 0.1.0 Author: Weixi Yen Copyright (c) 2010 Resopollution */
/* Adapted by Bergware for use in unRAID OS6 (June 2015) */
/* Adapted by Bergware for use in Unraid OS6 (June 2015) */
!function(e){var r=jQuery.event.fixHooks.drop;r?r.props?r.props.push("dataTransfer"):r.props=["dataTransfer"]:jQuery.event.fixHooks.drop={props:["dataTransfer"]};var t,n,a={},o={url:"",refresh:1e3,paramname:"userfile",maxfiles:25,maxfilesize:1024,data:{},drop:x,dragEnter:x,dragOver:x,dragLeave:x,docEnter:x,docOver:x,docLeave:x,beforeEach:x,afterAll:x,rename:x,error:function(e,r,t){alert(e)},uploadStarted:x,uploadFinished:x,progressUpdated:x,speedUpdated:x},i=["BrowserNotSupported","TooManyFiles","FileTooLarge"],d=!1,u=0;function s(e){return a.drop(e),null==(n=e.dataTransfer.files)?(a.error(i[0]),!1):(u=n.length,e.preventDefault(),function(){if(d=!1,!n)return a.error(i[0]),!1;var e=0,r=0;if(u>a.maxfiles)return a.error(i[1]),!1;for(var t=0;t<u;t++){if(d)return!1;try{if(0!=(p=n[t],a.beforeEach(p))){if(t===u)return;var o=new FileReader,s=1024*a.maxfilesize;if(o.index=t,n[t].size>s){a.error(i[2],n[t],t),r++;continue}o.onloadend=c,o.readAsDataURL(n[t])}else r++}catch(e){return a.error(i[0]),!1}}var p;function c(t){null==t.target.index&&(t.target.index=function(e){for(var r=0;r<u;r++)if(n[r].size==e)return r;return}(t.total));var o,i,s=new XMLHttpRequest,p=s.upload,c=n[t.target.index],v=t.target.index,g=(new Date).getTime();newName=(i=c.name,a.rename(i)),o="string"==typeof newName?f(newName,t.target.result):f(c.name,t.target.result),p.index=v,p.file=c,p.downloadStartTime=g,p.currentStart=g,p.currentProgress=0,p.startData=0,p.addEventListener("progress",l,!1),s.open("POST",a.url,!0),s.setRequestHeader("Content-Type","application/x-www-form-urlencoded"),s.send(o),a.uploadStarted(v,c,u),s.onload=function(){if(s.responseText){var t=(new Date).getTime(),n=t-g,o=a.uploadFinished(v,c,s.responseText,n);++e==u-r&&a.afterAll(),!1===o&&(d=!0)}}}return 0==r}())}function f(r,t){var n=[];return e.each(a.data,function(e,r){"function"==typeof r&&(r=r()),n.push(e+"="+r)}),n.push("filename="+encodeURI(r)),n.push("filedata="+t),n.join("&")}function l(e){if(e.lengthComputable){var r=Math.round(100*e.loaded/e.total);if(this.currentProgress!=r){this.currentProgress=r,a.progressUpdated(this.index,this.file,this.currentProgress);var t=(new Date).getTime(),n=t-this.currentStart;if(n>=a.refresh){var o=(e.loaded-this.startData)/n;a.speedUpdated(this.index,this.file,o),this.startData=e.loaded,this.currentStart=t}}}}function p(e){clearTimeout(t),e.preventDefault(),a.dragEnter(e)}function c(e){clearTimeout(t),e.preventDefault(),a.docOver(e),a.dragOver(e)}function v(e){clearTimeout(t),a.dragLeave(e),e.stopPropagation()}function g(e){return e.preventDefault(),a.docLeave(e),!1}function h(e){return clearTimeout(t),e.preventDefault(),a.docEnter(e),!1}function m(e){return clearTimeout(t),e.preventDefault(),a.docOver(e),!1}function T(e){t=setTimeout(function(){a.docLeave(e)},200)}function x(){}e.fn.filedrop=function(r){a=e.extend({},o,r),this.bind("drop",s).bind("dragenter",p).bind("dragover",c).bind("dragleave",v),e(document).bind("drop",g).bind("dragenter",h).bind("dragover",m).bind("dragleave",T)}}(jQuery);
plugins/dynamix/scripts/diagnostics
+2 -2
View File
@@ -71,9 +71,9 @@ if ($cli) {
exert("mkdir -p ".escapeshellarg("/$diag/system")." ".escapeshellarg("/$diag/config")." ".escapeshellarg("/$diag/logs")." ".escapeshellarg("/$diag/shares")." ".escapeshellarg("/$diag/smart")." ".escapeshellarg("/$diag/qemu"));
// get utilization of running processes
exert("top -bn1 -o%CPU 2>/dev/null|todos >".escapeshellarg("/$diag/system/top.txt"));
// make unRAID version reference
// make Unraid version reference
$unraid = parse_ini_file('/etc/unraid-version');
file_put_contents("/$diag/unRAID-".$unraid['version'].".txt",$unraid['version']);
file_put_contents("/$diag/unraid-".$unraid['version'].".txt",$unraid['version']);
// copy ini variables
foreach (glob("$get/*.ini") as $file) {
$ini = basename($file,".ini");
plugins/dynamix/scripts/monitor
+17 -17
View File
@@ -100,12 +100,12 @@ function check_temp($name,$temp,$text,$info) {
$last = $saved[$item][$name] ?? 0;
if ($warn) {
if ($temp>$last) {
exec("$notify -e ".escapeshellarg("unRAID $text temperature")." -s ".escapeshellarg(ucfirst($warn)." [$server] - $text ".($warn=='alert'?'overheated (':'is hot (').my_temp($temp).")")." -d ".escapeshellarg("$info")." -i \"$warn\"");
exec("$notify -e ".escapeshellarg("Unraid $text temperature")." -s ".escapeshellarg(ucfirst($warn)." [$server] - $text ".($warn=='alert'?'overheated (':'is hot (').my_temp($temp).")")." -d ".escapeshellarg("$info")." -i \"$warn\"");
$saved[$item][$name] = $max>0 && $temp<=$max ? $max : $temp;
}
} else {
if ($last && $temp<=$top) {
exec("$notify -e ".escapeshellarg("unRAID $text message")." -s ".escapeshellarg("Notice [$server] - $text returned to normal temperature")." -d ".escapeshellarg("$info"));
exec("$notify -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Notice [$server] - $text returned to normal temperature")." -d ".escapeshellarg("$info"));
unset($saved[$item][$name]);
}
}
@@ -134,13 +134,13 @@ function check_smart($name,$port,$text,$info) {
$last = ($saved[$item][$attr] ?? 0)*$level;
if ($raw>0 || $fail) {
if ($raw>$last) {
exec("$notify -e ".escapeshellarg("unRAID $text SMART health [$id]")." -s ".escapeshellarg("Warning [$server] - $word is $raw")." -d ".escapeshellarg("$info")." -i \"warning\"");
exec("$notify -e ".escapeshellarg("Unraid $text SMART health [$id]")." -s ".escapeshellarg("Warning [$server] - $word is $raw")." -d ".escapeshellarg("$info")." -i \"warning\"");
$saved[$item][$attr] = $raw;
unset($saved[$item][$ack]);
}
} else {
if ($last>0) {
exec("$notify -e ".escapeshellarg("unRAID $text SMART message [$id]")." -s ".escapeshellarg("Notice [$server] - $word returned to normal value")." -d ".escapeshellarg("$info"));
exec("$notify -e ".escapeshellarg("Unraid $text SMART message [$id]")." -s ".escapeshellarg("Notice [$server] - $word returned to normal value")." -d ".escapeshellarg("$info"));
unset($saved[$item][$attr]);
unset($saved[$item][$ack]);
}
@@ -151,13 +151,13 @@ function check_smart($name,$port,$text,$info) {
$last = $saved[$item][$attr] ?? 255;
if (($thres>0 && $value<=$thres*$level) || $fail) {
if ($value*($value>$thres?$level:1)<$last) {
exec("$notify -e ".escapeshellarg("unRAID $text SMART health [$id]")." -s ".escapeshellarg("Warning [$server] - $word is $value")." -d ".escapeshellarg("$info")." -i \"warning\"");
exec("$notify -e ".escapeshellarg("Unraid $text SMART health [$id]")." -s ".escapeshellarg("Warning [$server] - $word is $value")." -d ".escapeshellarg("$info")." -i \"warning\"");
$saved[$item][$attr] = $value;
unset($saved[$item][$ack]);
}
} else {
if ($last<255) {
exec("$notify -e ".escapeshellarg("unRAID $text SMART message [$id]")." -s ".escapeshellarg("Notice [$server] - $word returned to normal value")." -d ".escapeshellarg("$info"));
exec("$notify -e ".escapeshellarg("Unraid $text SMART message [$id]")." -s ".escapeshellarg("Notice [$server] - $word returned to normal value")." -d ".escapeshellarg("$info"));
unset($saved[$item][$attr]);
unset($saved[$item][$ack]);
}
@@ -179,12 +179,12 @@ function check_usage($name,$used,$text,$info) {
$last = $saved[$item][$name] ?? 0;
if ($warn) {
if ($used>$last) {
exec("$notify -e ".escapeshellarg("unRAID $text disk utilization")." -s ".escapeshellarg(ucfirst($warn)." [$server] - $text is ".($warn=='alert'?'low on space':'high on usage')." (${used}%)")." -d ".escapeshellarg("$info")." -i \"$warn\"");
exec("$notify -e ".escapeshellarg("Unraid $text disk utilization")." -s ".escapeshellarg(ucfirst($warn)." [$server] - $text is ".($warn=='alert'?'low on space':'high on usage')." (${used}%)")." -d ".escapeshellarg("$info")." -i \"$warn\"");
$saved[$item][$name] = $critical>0 && $used<=$critical ? $critical : $used;
}
} else {
if ($last && $used<=100) {
exec("$notify -e ".escapeshellarg("unRAID $text message")." -s ".escapeshellarg("Notice [$server] - $text returned to normal utilization level")." -d ".escapeshellarg("$info"));
exec("$notify -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Notice [$server] - $text returned to normal utilization level")." -d ".escapeshellarg("$info"));
unset($saved[$item][$name]);
}
}
@@ -210,20 +210,20 @@ foreach ($disks as $disk) {
case 'red':
if ($warn!=$last) {
$status = strtolower(str_replace(['NP_','_'],['',' '],$disk['status']));
exec("$notify -e ".escapeshellarg("unRAID $text error")." -s ".escapeshellarg("Alert [$server] - $text in error state ($status)")." -d ".escapeshellarg("$info")." -i \"alert\"");
exec("$notify -e ".escapeshellarg("Unraid $text error")." -s ".escapeshellarg("Alert [$server] - $text in error state ($status)")." -d ".escapeshellarg("$info")." -i \"alert\"");
$saved[$item][$name] = $warn;
}
break;
case 'yellow':
if ($warn!=$last) {
$status = $name=='parity' ? "parity-sync in progress" : "drive not ready, content being reconstructed";
exec("$notify -e ".escapeshellarg("unRAID $text error")." -s ".escapeshellarg("Warning [$server] - $text, $status")." -d ".escapeshellarg("$info")." -i \"warning\"");
exec("$notify -e ".escapeshellarg("Unraid $text error")." -s ".escapeshellarg("Warning [$server] - $text, $status")." -d ".escapeshellarg("$info")." -i \"warning\"");
$saved[$item][$name] = $warn;
}
break;
default:
if ($last) {
exec("$notify -e ".escapeshellarg("unRAID $text message")." -s ".escapeshellarg("Notice [$server] - $text returned to normal operation")." -d ".escapeshellarg("$info"));
exec("$notify -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Notice [$server] - $text returned to normal operation")." -d ".escapeshellarg("$info"));
unset($saved[$item][$name]);
}
break;}
@@ -235,14 +235,14 @@ foreach ($disks as $disk) {
$attr = 'missing';
if (exec("/sbin/btrfs filesystem show {$disk['uuid']} 2>/dev/null|grep -c 'missing'")>0) {
if (empty($saved[$item][$attr])) {
exec("$notify -e ".escapeshellarg("unRAID $text message")." -s ".escapeshellarg("Warning [$server] - Cache pool BTRFS missing device(s)")." -d ".escapeshellarg("$info")." -i \"warning\"");
exec("$notify -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Warning [$server] - Cache pool BTRFS missing device(s)")." -d ".escapeshellarg("$info")." -i \"warning\"");
$saved[$item][$attr] = 1;
}
} elseif (isset($saved[$item][$attr])) unset($saved[$item][$attr]);
$attr = 'profile';
if (exec("/sbin/btrfs filesystem df /mnt/cache 2>/dev/null|grep -c '^Data'")>1) {
if (empty($saved[$item][$attr])) {
exec("$notify -e ".escapeshellarg("unRAID $text message")." -s ".escapeshellarg("Warning [$server] - Cache pool BTRFS too many profiles")." -d ".escapeshellarg("$info")." -i \"warning\"");
exec("$notify -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Warning [$server] - Cache pool BTRFS too many profiles")." -d ".escapeshellarg("$info")." -i \"warning\"");
$saved[$item][$attr] = 1;
}
} elseif (isset($saved[$item][$attr])) unset($saved[$item][$attr]);
@@ -274,12 +274,12 @@ $info = "Array has $warn disk".($warn==1 ? "" : "s")." with read errors";
if ($warn>0) {
if ($warn<>$last) {
$message = implode('\n', $errors);
exec("$notify -e \"unRAID array errors\" -s ".escapeshellarg("Warning [$server] - array has errors")." -d ".escapeshellarg("$info")." -m ".escapeshellarg("$message")." -i \"warning\"");
exec("$notify -e \"Unraid array errors\" -s ".escapeshellarg("Warning [$server] - array has errors")." -d ".escapeshellarg("$info")." -m ".escapeshellarg("$message")." -i \"warning\"");
$saved[$item][$name] = $warn;
}
} else {
if ($last) {
exec("$notify -e \"unRAID array errors\" -s ".escapeshellarg("Notice [$server] - array turned good")." -d ".escapeshellarg("$info"));
exec("$notify -e \"Unraid array errors\" -s ".escapeshellarg("Notice [$server] - array turned good")." -d ".escapeshellarg("$info"));
unset($saved[$item][$name]);
}
}
@@ -299,7 +299,7 @@ if ($var['mdResync']>0) {
$last = 'Parity check';
}
$info = "Size: ".my_scale($var['mdResyncSize']*1024,$unit)." $unit";
exec("$notify -e ".escapeshellarg("unRAID $last")." -s ".escapeshellarg("Notice [$server] - $last started")." -d ".escapeshellarg("$info")." -i \"warning\"");
exec("$notify -e ".escapeshellarg("Unraid $last")." -s ".escapeshellarg("Notice [$server] - $last started")." -d ".escapeshellarg("$info")." -i \"warning\"");
$saved[$item][$name] = $last;
}
} else {
@@ -310,7 +310,7 @@ if ($var['mdResync']>0) {
list($entry,$duration,$speed,$status,$error) = explode('|', read_write_parity_log($var['sbSynced2'],$duration,$speed,$status,$var['sbSyncErrs']));
$info = $status==0 ? "Duration: ".my_check($duration, $speed) : ($status==-4 ? "Canceled" : "Error code: $status");
$level = ($status==0 && $var['sbSyncErrs']==0) ? "normal" : "warning";
exec("$notify -e ".escapeshellarg("unRAID $last")." -s ".escapeshellarg("Notice [$server] - $last finished ($error errors)")." -d ".escapeshellarg("$info")." -i \"$level\"");
exec("$notify -e ".escapeshellarg("Unraid $last")." -s ".escapeshellarg("Notice [$server] - $last finished ($error errors)")." -d ".escapeshellarg("$info")." -i \"$level\"");
unset($saved[$item][$name]);
}
}
plugins/dynamix/scripts/newperms
+1 -1
View File
@@ -6,7 +6,7 @@
# If no arguments given, operates on /mnt/cache and /mnt/disk*, setting owner:group to nobody:users
# default owner is 'nobody', default group is 'users'
# This was created to fix ownership/permissions when upgrading to unRAID version 5.
# This was created to fix ownership/permissions when upgrading to Unraid version 5.
# With corrections suggested by forum member Stokkes
plugins/dynamix/scripts/notify
+2 -2
View File
@@ -139,7 +139,7 @@ case 'cron-init':
@mkdir($archive,0755,true);
$text = empty($notify['status']) ? "" : "# Generated array status check schedule:\n{$notify['status']} $docroot/plugins/dynamix/scripts/statuscheck &> /dev/null\n\n";
parse_cron_cfg("dynamix", "status-check", $text);
$text = empty($notify['unraidos']) ? "" : "# Generated unRAID OS update check schedule:\n{$notify['unraidos']} $docroot/plugins/dynamix.plugin.manager/scripts/unraidcheck &> /dev/null\n\n";
$text = empty($notify['unraidos']) ? "" : "# Generated Unraid OS update check schedule:\n{$notify['unraidos']} $docroot/plugins/dynamix.plugin.manager/scripts/unraidcheck &> /dev/null\n\n";
parse_cron_cfg("dynamix", "unraid-check", $text);
$text = empty($notify['version']) ? "" : "# Generated plugins version check schedule:\n{$notify['version']} $docroot/plugins/dynamix.plugin.manager/scripts/plugincheck &> /dev/null\n\n";
parse_cron_cfg("dynamix", "plugin-check", $text);
@@ -150,7 +150,7 @@ case 'cron-init':
break;
case 'add':
$event = 'unRAID Status';
$event = 'Unraid Status';
$subject = 'Notification';
$description = 'No description';
$importance = 'normal';