diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page index 4737fa67d..fab91b820 100644 --- a/plugins/dynamix.docker.manager/DockerSettings.page +++ b/plugins/dynamix.docker.manager/DockerSettings.page @@ -136,7 +136,8 @@ span.disabled{color:#404040}
- + + Enable Docker: diff --git a/plugins/dynamix.docker.manager/include/GetContainerSize.php b/plugins/dynamix.docker.manager/include/GetContainerSize.php index 52d1d994d..8b08878bd 100644 --- a/plugins/dynamix.docker.manager/include/GetContainerSize.php +++ b/plugins/dynamix.docker.manager/include/GetContainerSize.php @@ -40,7 +40,7 @@ foreach ($container as $ct) { list($name,$size) = explode('|',$ct); list($writable,$dummy,$total) = explode(' ',str_replace(['(',')'],'',$size)); list($value,$base) = explode(' ',gap($total)); - $list[] = ['name' => $name, 'total' => $value*pow(1000,array_search($base,$unit)), 'writable' => $writable, 'log' => exec("docker inspect --format='{{.LogPath}}' $name|xargs du -b|cut -f1")]; + $list[] = ['name' => $name, 'total' => $value*pow(1000,array_search($base,$unit)), 'writable' => $writable, 'log' => (exec("docker inspect --format='{{.LogPath}}' $name|xargs du -b 2>/dev/null |cut -f1")) ?: "0"]; } array_multisort(array_column($list,'total'),SORT_DESC,$list); // sort on container size foreach ($list as $ct) echo align($ct['name'],-30).align(autoscale($ct['total'])).align($ct['writable']).align(autoscale($ct['log']))."\n"; diff --git a/plugins/dynamix.vm.manager/VMSettings.page b/plugins/dynamix.vm.manager/VMSettings.page index 82289bf5a..6eb411adf 100644 --- a/plugins/dynamix.vm.manager/VMSettings.page +++ b/plugins/dynamix.vm.manager/VMSettings.page @@ -80,7 +80,8 @@ body{-webkit-overflow-scrolling:touch} - + + Enable VMs: : @@ -258,9 +270,9 @@ $(function(){ ".my_disk($disk['name'])." • ".my_id($disk['id'])." (".$disk['device'].")
";?> - Format will create a file system in all Unmountable disks, discarding all data currently on those disks.
- - Yes I want to do this All data is permanently lost !!!
This is not used to recover data
Format is never part of a rebuild + Format will create a file system in all Unmountable disks.
+ + Yes I want to do this Estimated speed: Estimated finish: - Sync errors detected:corrected: + Sync errors detected:corrected: Stopped. This Unraid OS release has been withdrawn and may no longer be used. Please update your server. - Stopped. Configuration valid. - Start will bring the array on-line and start Parity-Sync and/or Data-Rebuild. - - Stopped. New data disk(s) detected. - Start will bring the array on-line and start Clearing new data disk(s). - - Stopped. Unclean shutdown detected. - Start will bring the array on-line. - - Stopped. Unclean shutdown detected. - Start will bring the array on-line and start Parity-Check. -
Write corrections to parity - - Stopped. Missing Cache disk. - Start will remove the missing cache disk and then bring the array on-line. + switch ($var['mdState']): + case "STOPPED": + if (strstr($var['mdResyncAction'],"recon")):?> + Stopped. Configuration valid. + Start will bring the array on-line and start Parity-Sync and/or Data-Rebuild. + + Stopped. New data disk(s) detected. + Start will bring the array on-line and start Clearing new data disk(s). + + Stopped. Unclean shutdown detected. + Start will bring the array on-line. + + Stopped. Unclean shutdown detected. + Start will bring the array on-line and start Parity-Check. +
Write corrections to parity + + Stopped. Missing Cache disk. + Start will remove the missing cache disk and then bring the array on-line. +
Yes I want to do this + + Stopped. Configuration valid. + Start will bring the array on-line. + + Stopped. Configuration valid. + Start will record all disk information and bring the array on-line. +
The array will be immediately available, but unprotected since parity has not been assigned. + + Stopped. Configuration valid. + Start will record all disk information, bring the array on-line, and start Parity-Sync. +
The array will be immediately available, but unprotected until Parity-Sync completes. +
Parity is already valid. + + Stopped. Missing disk. + Start will disable the missing disk and then bring the array on-line. Install a replacement disk as soon as possible.
Yes I want to do this - - Stopped. Configuration valid. - Start will bring the array on-line. - - Stopped. Configuration valid. - Start will record all disk information and bring the array on-line. -
The array will be immediately available, but unprotected since parity has not been assigned. - - Stopped. Configuration valid. - Start will record all disk information, bring the array on-line, and start Parity-Sync. -
The array will be immediately available, but unprotected until Parity-Sync completes. -
Parity is already valid. - - Stopped. Missing disk. - Start will disable the missing disk and then bring the array on-line. Install a replacement disk as soon as possible. -
Yes I want to do this - - Stopped. Replacement disk installed. - Start will start Parity-Sync and/or Data-Rebuild. - - Stopped. Upgrading disk/swapping parity. - Start will expand the file system of the data disk (if possible); then bring the array on-line and start Data-Rebuild. - Stopped. Upgrading disk/swapping parity. - Copy will copy the parity information to the new parity disk. -
Once copy completes, the array may be Started, to initiate Data-Rebuild of the disabled disk. -
Yes I want to do this - - Stopped. Invalid expansion. - You may not add new disk(s) and also remove existing disk(s). - - Stopped. Replacement disk is too small. - The replacement disk must be as big or bigger than the original. - - Stopped. Disk in parity slot is not biggest. - If this is a new array, move the largest disk into the parity slot. -
If you are adding a new disk or replacing a disabled disk, try Parity-Swap. - - Stopped. Invalid configuration. - Too many wrong and/or missing disks! - - Stopped. No data disks. - No array data disks have been assigned! - + Stopped. Replacement disk installed. + Start will start Parity-Sync and/or Data-Rebuild. + + Stopped. Upgrading disk/swapping parity. + Start will expand the file system of the data disk (if possible); then bring the array on-line and start Data-Rebuild. + + Stopped. Upgrading disk/swapping parity. + Copy will copy the parity information to the new parity disk. +
Once copy completes, the array may be Started, to initiate Data-Rebuild of the disabled disk. +
Yes I want to do this + + Stopped. Invalid expansion. + You may not add new disk(s) and also remove existing disk(s). + + Stopped. Replacement disk is too small. + The replacement disk must be as big or bigger than the original. + + Stopped. Disk in parity slot is not biggest. + If this is a new array, move the largest disk into the parity slot. +
If you are adding a new disk or replacing a disabled disk, try Parity-Swap. + + Stopped. Invalid configuration. + Too many wrong and/or missing disks! + + Stopped. No data disks. + No array data disks have been assigned! + diff --git a/plugins/dynamix/include/publish.php b/plugins/dynamix/include/publish.php index 8a63346c4..226e02ae2 100644 --- a/plugins/dynamix/include/publish.php +++ b/plugins/dynamix/include/publish.php @@ -19,11 +19,12 @@ function curl_socket($socket, $url, $postdata = NULL) curl_setopt($ch, CURLOPT_POSTFIELDS, $postdata); } curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_exec($ch); + $result = curl_exec($ch); curl_close($ch); + return $result; } function publish($endpoint, $message) { - curl_socket("/var/run/nginx.socket", "http://localhost/pub/$endpoint?buffer_length=1", $message); + return curl_socket("/var/run/nginx.socket", "http://localhost/pub/$endpoint?buffer_length=1", $message); } ?> diff --git a/plugins/dynamix/scripts/emcmd b/plugins/dynamix/scripts/emcmd new file mode 100755 index 000000000..62ff50829 --- /dev/null +++ b/plugins/dynamix/scripts/emcmd @@ -0,0 +1,14 @@ +#!/usr/bin/php + diff --git a/plugins/dynamix/scripts/emhttpd_update b/plugins/dynamix/scripts/emhttpd_update deleted file mode 100755 index 4d9a17664..000000000 --- a/plugins/dynamix/scripts/emhttpd_update +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/php -q - -