diff --git a/plugins/dynamix.docker.manager/default.cfg b/plugins/dynamix.docker.manager/default.cfg
new file mode 100644
index 000000000..366233525
--- /dev/null
+++ b/plugins/dynamix.docker.manager/default.cfg
@@ -0,0 +1,7 @@
+DOCKER_ENABLED="no"
+DOCKER_IMAGE_SIZE="20"
+DOCKER_LOG_ROTATION="yes"
+DOCKER_LOG_SIZE="50m"
+DOCKER_LOG_FILES="1"
+DOCKER_AUTHORING_MODE="no"
+DOCKER_USER_NETWORKS="remove"
diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index 69bbe8e86..11c027cd2 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -18,6 +18,7 @@ require_once "$docroot/plugins/dynamix.docker.manager/include/Helpers.php";
require_once "$docroot/webGui/include/Helpers.php";
$var = parse_ini_file('state/var.ini');
+$cfg = parse_ini_file('boot/config/docker.cfg');
ignore_user_abort(true);
$DockerClient = new DockerClient();
diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php
index b9dd92ed7..eb0c7d2f8 100644
--- a/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -38,7 +38,8 @@ $driver = DockerUtil::driver();
// Docker configuration file - guaranteed to exist
$docker_cfgfile = '/boot/config/docker.cfg';
-$dockercfg = parse_ini_file($docker_cfgfile);
+$defaults = @parse_ini_file("$docroot/plugins/dynamix.docker.manager/default.cfg") ?: [];
+$dockercfg = array_replace_recursive($defaults, parse_ini_file($docker_cfgfile));
function var_split($item, $i=0) {
return explode(' ',$item)[$i];
diff --git a/plugins/dynamix.docker.manager/include/Helpers.php b/plugins/dynamix.docker.manager/include/Helpers.php
index 40614fe7d..b0ec848c9 100644
--- a/plugins/dynamix.docker.manager/include/Helpers.php
+++ b/plugins/dynamix.docker.manager/include/Helpers.php
@@ -1,5 +1,17 @@
+
">
">
diff --git a/plugins/dynamix/include/SystemInformation.php b/plugins/dynamix/include/SystemInformation.php
index 83d8dd05d..edabb8294 100644
--- a/plugins/dynamix/include/SystemInformation.php
+++ b/plugins/dynamix/include/SystemInformation.php
@@ -84,11 +84,11 @@ echo $cpumodel.(strpos($cpumodel,'@')!==false ? "" : " @ {$cpu['Current Speed']}
HVM:
';
if (strpos($strCPUInfo,'vmx')===false && strpos($strCPUInfo, 'svm')===false) {
- // CPU doesn't support virtualzation
+ // CPU doesn't support virtualization
echo "Not Available";
} else {
- // Motherboard either doesn't support virtualzation or BIOS has it disabled
+ // Motherboard either doesn't support virtualization or BIOS has it disabled
echo "Disabled";
}
echo '';
@@ -118,7 +118,7 @@ if (!empty($iommu_groups)) {
} else {
echo '
';
if (strpos($strCPUInfo,'vmx')===false && strpos($strCPUInfo, 'svm')===false) {
- // CPU doesn't support virtualzation so iommu would be impossible
+ // CPU doesn't support virtualization so iommu would be impossible
echo "Not Available";
} else {
// Motherboard either doesn't support iommu or BIOS has it disabled
diff --git a/plugins/dynamix/scripts/disk_size b/plugins/dynamix/scripts/disk_size
index a6385dc01..598ac6273 100755
--- a/plugins/dynamix/scripts/disk_size
+++ b/plugins/dynamix/scripts/disk_size
@@ -22,9 +22,8 @@ function check {
total=$(($total + $size))
fi
}
-shares=$(ls -vd /mnt/user/*)
-for share in $shares; do
+while IFS=$'\n' read -r share; do
[[ -d $share ]] && check "$(basename "$share")" "$disk"
-done
+done <<< $(ls -vd /mnt/user/*)
echo "share.total=$total" >>"$output"
echo "total disk usage: $total"
diff --git a/plugins/dynamix/scripts/share_size b/plugins/dynamix/scripts/share_size
index ec524b2f7..54f6b139b 100755
--- a/plugins/dynamix/scripts/share_size
+++ b/plugins/dynamix/scripts/share_size
@@ -23,9 +23,8 @@ function check {
}
check "/mnt/cache" "$share"
-disks=$(ls -vd /mnt/disk*)
-for disk in $disks ; do
+while IFS=$'\n' read -r disk; do
check "$disk" "$share"
-done
+done <<< $(ls -vd /mnt/disk[0-9]*)
echo "disk.total=$total" >>"$output"
echo "total disk usage: $total"
diff --git a/plugins/dynamix/styles/default-cases.css b/plugins/dynamix/styles/default-cases.css
index 044f70028..8a5a9dd40 100644
--- a/plugins/dynamix/styles/default-cases.css
+++ b/plugins/dynamix/styles/default-cases.css
@@ -1,6 +1,9 @@
@font-face{font-family:cases;font-weight:normal;font-style:normal;
-src:url('font-cases.eot?20190111');src:url('font-cases.eot?20190111#iefix') format('embedded-opentype'),url('font-cases.ttf?20190111') format('truetype'),url('font-cases.woff?20190111') format('woff'),url('font-cases.svg?20190111#cases') format('svg')}
+src:url('font-cases.eot?20190115');src:url('font-cases.eot?20190115#iefix') format('embedded-opentype'),url('font-cases.ttf?20190115') format('truetype'),url('font-cases.woff?20190115') format('woff'),url('font-cases.svg?20190115#cases') format('svg')}
[class^='case-'],[class*=' case-']{font-family:cases!important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none}
+.case-3u-md1510:before{content:'\e91a'}
+.case-4u-storinator:before{content:'\e91b'}
+.case-storinator-ws:before{content:'\e91c'}
.case-full-tower:before{content:'\e914'}
.case-htpc:before{content:'\e915'}
.case-mid-tower:before{content:'\e916'}
diff --git a/plugins/dynamix/styles/font-cases.eot b/plugins/dynamix/styles/font-cases.eot
index d62729c7f..ffbef94df 100644
Binary files a/plugins/dynamix/styles/font-cases.eot and b/plugins/dynamix/styles/font-cases.eot differ
diff --git a/plugins/dynamix/styles/font-cases.svg b/plugins/dynamix/styles/font-cases.svg
index 8b76dd03a..c08ad6ed5 100644
--- a/plugins/dynamix/styles/font-cases.svg
+++ b/plugins/dynamix/styles/font-cases.svg
@@ -7,12 +7,12 @@
{
"fontFamily": "Unraid-Cases",
"majorVersion": 1,
- "minorVersion": 2,
+ "minorVersion": 3,
"fontURL": "http://www.unraid.net",
"copyright": "Magnus Engø",
"designer": "Magnus Engø",
"designerURL": "http://www.magnusengo.net",
- "version": "Version 1.2",
+ "version": "Version 1.3",
"fontId": "Unraid-Cases",
"psName": "Unraid-Cases",
"subFamily": "Regular",
@@ -53,4 +53,7 @@
+
+
+
\ No newline at end of file
diff --git a/plugins/dynamix/styles/font-cases.ttf b/plugins/dynamix/styles/font-cases.ttf
index 93736ea4d..8858c93c1 100644
Binary files a/plugins/dynamix/styles/font-cases.ttf and b/plugins/dynamix/styles/font-cases.ttf differ
diff --git a/plugins/dynamix/styles/font-cases.woff b/plugins/dynamix/styles/font-cases.woff
index 7d3713140..dc305ba24 100644
Binary files a/plugins/dynamix/styles/font-cases.woff and b/plugins/dynamix/styles/font-cases.woff differ