_(IPv4 address assignment)_:
:
-
-
-
+
+
+
-
+
:eth_ipv4_address_assignment_help:
_(IPv4 address)_:
-:
" class="narrow" pattern="" title="_(IPv4 address A.B.C.D)_">/
+:
$prefix) echo mk_option(_var($eth0,"NETMASK:$i"), $mask, $prefix, _var($eth0,"NETMASK:$i")=='' && $prefix=='24'?'selected':'');?>
@@ -838,19 +861,19 @@ _(IPv4 default gateway)_:
diff --git a/emhttp/plugins/dynamix/ManagementAccess.page b/emhttp/plugins/dynamix/ManagementAccess.page
index e343cd7af..a2eae391c 100644
--- a/emhttp/plugins/dynamix/ManagementAccess.page
+++ b/emhttp/plugins/dynamix/ManagementAccess.page
@@ -4,7 +4,7 @@ Title="Management Access"
Icon="icon-key"
Tag="expeditedssl"
---
-
-/dev/null|sed -n 's/ *commonName *= //p'");
- $cert2Issuer = exec("/usr/bin/openssl x509 -in $cert2File -noout -text | sed -n -e 's/^.*Issuer: //p'");
- $cert2Expires = exec("/usr/bin/openssl x509 -in $cert2File -noout -text | sed -n -e 's/^.*Not After : //p'");
- $isWildcardCert = preg_match('/.*\.myunraid\.net$/', $cert2Subject);
- $subject2URL = $cert2Subject;
- $dnsValid = false;
- $dnsRebindingProtection = false;
- if ($isWildcardCert) {
- exec("openssl x509 -checkend 2592000 -noout -in $cert2File 2>/dev/null", $arrout, $retval_expired);
- if (!$addr) {
- // if eth0 doesn't have an IP address, then show noip.hash.myunraid.net as a placeholder url
- $subject2URL = str_replace("*", 'noip', $subject2URL);
- $dnsValid = false;
- $dnsRebindingProtection = false;
- } elseif (strpos($addr, ":") === false) {
- // eth0 is IPv4
- $subject2URL = str_replace("*", str_replace(".", "-", $addr), $subject2URL);
- $rebindtest_ip = exec("host -4 -t A rebindtest4.myunraid.net 2>/dev/null|awk '{print \$4}'");
- $dnsRebindingProtection = ($rebindtest_ip != "192.168.42.42");
- if (!$dnsRebindingProtection) {
- $cert_ip = exec("host -4 -t A $subject2URL 2>/dev/null|awk '{print \$4}'");
- $dnsValid = $cert_ip==$addr;
- }
- } else {
- // eth0 is IPv6
- $subject2URL = str_replace("*", str_replace(":", "-", $addr), $subject2URL);
- $rebindtest_ip = exec("host -6 -t AAAA rebindtest6.myunraid.net 2>/dev/null|awk '{print \$4}'");
- // more: restore this after TTL expires
- // $dnsRebindingProtection = ($rebindtest_ip != "fd42::42");
- $dnsRebindingProtection = ($rebindtest_ip != "fd42::42") && ($rebindtest_ip != "fd42::");
- if (!$dnsRebindingProtection) {
- $cert_ip = exec("host -6 -t AAAA $subject2URL 2>/dev/null|awk '{print \$4}'");
- $dnsValid = $cert_ip==$addr;
- }
+ $cert2Subject = exec("/usr/bin/openssl x509 -in $cert2File -noout -subject -nameopt multiline 2>/dev/null|sed -n 's/ *commonName *= //p'");
+ $cert2Issuer = exec("/usr/bin/openssl x509 -in $cert2File -noout -text | sed -n -e 's/^.*Issuer: //p'");
+ $cert2Expires = exec("/usr/bin/openssl x509 -in $cert2File -noout -text | sed -n -e 's/^.*Not After : //p'");
+ $isWildcardCert = preg_match('/.*\.myunraid\.net$/', $cert2Subject);
+ $subject2URL = $cert2Subject;
+ $dnsValid = false;
+ $dnsRebindingProtection = false;
+ if ($isWildcardCert) {
+ exec("openssl x509 -checkend 2592000 -noout -in $cert2File 2>/dev/null", $arrout, $retval_expired);
+ if (!$addr) {
+ // if eth0 doesn't have an IP address, then show noip.hash.myunraid.net as a placeholder url
+ $subject2URL = str_replace("*", 'noip', $subject2URL);
+ $dnsValid = false;
+ $dnsRebindingProtection = false;
+ } elseif (strpos($addr, ":") === false) {
+ // eth0 is IPv4
+ $subject2URL = str_replace("*", str_replace(".", "-", $addr), $subject2URL);
+ $rebindtest_ip = exec("host -4 -t A rebindtest4.myunraid.net 2>/dev/null|awk '{print \$4}'");
+ $dnsRebindingProtection = ($rebindtest_ip != "192.168.42.42");
+ if (!$dnsRebindingProtection) {
+ $cert_ip = exec("host -4 -t A $subject2URL 2>/dev/null|awk '{print \$4}'");
+ $dnsValid = $cert_ip == $addr;
+ }
+ } else {
+ // eth0 is IPv6
+ $subject2URL = str_replace("*", str_replace(":", "-", $addr), $subject2URL);
+ $rebindtest_ip = exec("host -6 -t AAAA rebindtest6.myunraid.net 2>/dev/null|awk '{print \$4}'");
+ // more: restore this after TTL expires
+ // $dnsRebindingProtection = ($rebindtest_ip != "fd42::42");
+ $dnsRebindingProtection = ($rebindtest_ip != "fd42::42") && ($rebindtest_ip != "fd42::");
+ if (!$dnsRebindingProtection) {
+ $cert_ip = exec("host -6 -t AAAA $subject2URL 2>/dev/null|awk '{print \$4}'");
+ $dnsValid = $cert_ip == $addr;
+ }
+ }
}
- }
}
// Tailscale LE cert
$cert3File = "/boot/config/ssl/certs/ts_bundle.pem";
$cert3Present = file_exists("$cert3File");
if ($cert3Present) {
- $cert3Subject = exec("/usr/bin/openssl x509 -in $cert3File -noout -subject -nameopt multiline 2>/dev/null|sed -n 's/ *commonName *= //p'");
- $cert3Issuer = exec("/usr/bin/openssl x509 -in $cert3File -noout -text | sed -n -e 's/^.*Issuer: //p'");
- $cert3Expires = exec("/usr/bin/openssl x509 -in $cert3File -noout -text | sed -n -e 's/^.*Not After : //p'");
+ $cert3Subject = exec("/usr/bin/openssl x509 -in $cert3File -noout -subject -nameopt multiline 2>/dev/null|sed -n 's/ *commonName *= //p'");
+ $cert3Issuer = exec("/usr/bin/openssl x509 -in $cert3File -noout -text | sed -n -e 's/^.*Issuer: //p'");
+ $cert3Expires = exec("/usr/bin/openssl x509 -in $cert3File -noout -text | sed -n -e 's/^.*Not After : //p'");
}
// Note: this disables FQDN6 urls since they are not supported by myunraid.net DNS currently
-if (!empty($nginx['NGINX_LANFQDN6'])) unset($nginx['NGINX_LANFQDN6']);
+if (!empty($nginx['NGINX_LANFQDN6'])) {
+ unset($nginx['NGINX_LANFQDN6']);
+}
-$http_port = _var($var,'PORT','80') != '80' ? ":{$var['PORT']}" : '';
-$https_port = _var($var,'PORTSSL','443') != '443' ? ":{$var['PORTSSL']}" : '';
-$http_ip_url = 'http://'._var($nginx,'NGINX_LANIP').$http_port.'/';
-$https_ip_url = 'https://'._var($nginx,'NGINX_LANIP').$https_port.'/';
+$http_port = _var($var, 'PORT', '80') != '80' ? ":{$var['PORT']}" : '';
+$https_port = _var($var, 'PORTSSL', '443') != '443' ? ":{$var['PORTSSL']}" : '';
+$http_ip_url = 'http://'._var($nginx, 'NGINX_LANIP').$http_port.'/';
+$https_ip_url = 'https://'._var($nginx, 'NGINX_LANIP').$https_port.'/';
// bare IPv6 addresses need to be surrounded in brackets
-$http_ip6_url = 'http://'.'['._var($nginx,'NGINX_LANIP6').']'.$http_port.'/';
-$https_ip6_url = 'https://'.'['._var($nginx,'NGINX_LANIP6').']'.$https_port.'/';
-$http_mdns_url = 'http://'._var($nginx,'NGINX_LANMDNS').$http_port.'/';
-$https_mdns_url = 'https://'._var($nginx,'NGINX_LANMDNS').$https_port.'/';
-$https_fqdn_url = 'https://'._var($nginx,'NGINX_LANFQDN').$https_port.'/';
-$https_fqdn6_url = 'https://'._var($nginx,'NGINX_LANFQDN6').$https_port.'/';
+$http_ip6_url = 'http://'.'['._var($nginx, 'NGINX_LANIP6').']'.$http_port.'/';
+$https_ip6_url = 'https://'.'['._var($nginx, 'NGINX_LANIP6').']'.$https_port.'/';
+$http_mdns_url = 'http://'._var($nginx, 'NGINX_LANMDNS').$http_port.'/';
+$https_mdns_url = 'https://'._var($nginx, 'NGINX_LANMDNS').$https_port.'/';
+$https_fqdn_url = 'https://'._var($nginx, 'NGINX_LANFQDN').$https_port.'/';
+$https_fqdn6_url = 'https://'._var($nginx, 'NGINX_LANFQDN6').$https_port.'/';
$urls = [];
// push an array of five values into the $urls array:
@@ -150,94 +166,138 @@ $urls = [];
// 5 - self-signed certificate, or false
// define LAN access urls and redirects that change based on USE_SSL setting
-switch(_var($var,'USE_SSL','no')) {
-case 'no':
- if (!empty($nginx['NGINX_LANIP'])) $urls[] = ['LAN', $http_ip_url, null, null, false];
- if (!empty($nginx['NGINX_LANIP6'])) $urls[] = ['LAN', $http_ip6_url, null, null, false];
- if (!empty($nginx['NGINX_LANMDNS'])) $urls[] = ['LAN', $http_mdns_url, null, null, false];
- break;
-case 'yes':
- if (!empty($nginx['NGINX_LANIP'])) $urls[] = ['LAN', $http_ip_url, $https_ip_url, null, false];
- if (!empty($nginx['NGINX_LANIP'])) $urls[] = ['LAN', $https_ip_url, null, "{$var['NAME']}_unraid_bundle.pem", $cert1SelfSigned];
- if (!empty($nginx['NGINX_LANIP6'])) $urls[] = ['LAN', $http_ip6_url, $https_ip6_url, null, false];
- if (!empty($nginx['NGINX_LANIP6'])) $urls[] = ['LAN', $https_ip6_url, null, "{$var['NAME']}_unraid_bundle.pem", $cert1SelfSigned];
- if (!empty($nginx['NGINX_LANMDNS'])) $urls[] = ['LAN', $http_mdns_url, $https_mdns_url, null, false];
- if (!empty($nginx['NGINX_LANMDNS'])) $urls[] = ['LAN', $https_mdns_url, null, "{$var['NAME']}_unraid_bundle.pem", $cert1SelfSigned];
- break;
-case 'auto': // aka strict
- if (!empty($nginx['NGINX_LANIP']) && !empty($nginx['NGINX_LANFQDN'])) $urls[] = ['LAN', $http_ip_url, $https_fqdn_url, null, false];
- if (!empty($nginx['NGINX_LANIP6']) && !empty($nginx['NGINX_LANFQDN6'])) $urls[] = ['LAN', $http_ip6_url, $https_fqdn6_url, null, false];
- if (!empty($nginx['NGINX_LANMDNS']) && !empty($nginx['NGINX_LANFQDN'])) $urls[] = ['LAN', $http_mdns_url, $https_fqdn_url, null, false];
- break;
+switch (_var($var, 'USE_SSL', 'no')) {
+ case 'no':
+ if (!empty($nginx['NGINX_LANIP'])) {
+ $urls[] = ['LAN', $http_ip_url, null, null, false];
+ }
+ if (!empty($nginx['NGINX_LANIP6'])) {
+ $urls[] = ['LAN', $http_ip6_url, null, null, false];
+ }
+ if (!empty($nginx['NGINX_LANMDNS'])) {
+ $urls[] = ['LAN', $http_mdns_url, null, null, false];
+ }
+ break;
+ case 'yes':
+ if (!empty($nginx['NGINX_LANIP'])) {
+ $urls[] = ['LAN', $http_ip_url, $https_ip_url, null, false];
+ }
+ if (!empty($nginx['NGINX_LANIP'])) {
+ $urls[] = ['LAN', $https_ip_url, null, "{$var['NAME']}_unraid_bundle.pem", $cert1SelfSigned];
+ }
+ if (!empty($nginx['NGINX_LANIP6'])) {
+ $urls[] = ['LAN', $http_ip6_url, $https_ip6_url, null, false];
+ }
+ if (!empty($nginx['NGINX_LANIP6'])) {
+ $urls[] = ['LAN', $https_ip6_url, null, "{$var['NAME']}_unraid_bundle.pem", $cert1SelfSigned];
+ }
+ if (!empty($nginx['NGINX_LANMDNS'])) {
+ $urls[] = ['LAN', $http_mdns_url, $https_mdns_url, null, false];
+ }
+ if (!empty($nginx['NGINX_LANMDNS'])) {
+ $urls[] = ['LAN', $https_mdns_url, null, "{$var['NAME']}_unraid_bundle.pem", $cert1SelfSigned];
+ }
+ break;
+ case 'auto': // aka strict
+ if (!empty($nginx['NGINX_LANIP']) && !empty($nginx['NGINX_LANFQDN'])) {
+ $urls[] = ['LAN', $http_ip_url, $https_fqdn_url, null, false];
+ }
+ if (!empty($nginx['NGINX_LANIP6']) && !empty($nginx['NGINX_LANFQDN6'])) {
+ $urls[] = ['LAN', $http_ip6_url, $https_fqdn6_url, null, false];
+ }
+ if (!empty($nginx['NGINX_LANMDNS']) && !empty($nginx['NGINX_LANFQDN'])) {
+ $urls[] = ['LAN', $http_mdns_url, $https_fqdn_url, null, false];
+ }
+ break;
}
// define FQDN urls for each interface
// when multiple FQDN urls are available for a given interface, make sure they are sorted
asort($nginx);
foreach ($nginx as $key => $host) {
- if (!$host) continue;
- // Only process keys that include 'FQDN'
- if (strpos($key, 'FQDN') === false) continue;
- // Extract the interface from the key, e.g., 'NGINX_LANFQDN' -> 'LAN', 'NGINX_WANFQDN' -> 'WAN', NGINX_WG0FQDN -> WG, NGINX_TAILSCALE1FQDN -> TAILSCALE
- // Note: this specifically excludes FQDN6 urls since they are not supported by myunraid.net DNS currently
- if (preg_match('/^NGINX_([A-Z]+)(\d*)FQDN$/', $key, $matches)) {
- $interface = $matches[1]; // Interface type (LAN, WAN, WG, TAILSCALE, etc.)
- // ignore the WAN interface because we don't have access to the WANPORT here
- if ($interface == "WAN") continue;
- $pem = null;
- if (str_ends_with($host, '.myunraid.net')) $pem = 'certificate_bundle.pem';
- elseif (str_ends_with($host, '.ts.net')) $pem = 'ts_bundle.pem';
- $url = 'https://'.$host.$https_port."/";
- $urls[] = [$interface, $url, null, $pem, false];
- }
+ if (!$host) {
+ continue;
+ }
+ // Only process keys that include 'FQDN'
+ if (strpos($key, 'FQDN') === false) {
+ continue;
+ }
+ // Extract the interface from the key, e.g., 'NGINX_LANFQDN' -> 'LAN', 'NGINX_WANFQDN' -> 'WAN', NGINX_WG0FQDN -> WG, NGINX_TAILSCALE1FQDN -> TAILSCALE
+ // Note: this specifically excludes FQDN6 urls since they are not supported by myunraid.net DNS currently
+ if (preg_match('/^NGINX_([A-Z]+)(\d*)FQDN$/', $key, $matches)) {
+ $interface = $matches[1]; // Interface type (LAN, WAN, WG, TAILSCALE, etc.)
+ // ignore the WAN interface because we don't have access to the WANPORT here
+ if ($interface == "WAN") {
+ continue;
+ }
+ $pem = null;
+ if (str_ends_with($host, '.myunraid.net')) {
+ $pem = 'certificate_bundle.pem';
+ } elseif (str_ends_with($host, '.ts.net')) {
+ $pem = 'ts_bundle.pem';
+ }
+ $url = 'https://'.$host.$https_port."/";
+ $urls[] = [$interface, $url, null, $pem, false];
+ }
}
// determine whether there are urls for a given list of interfaces
-function has_urls(array $interfaces) {
- global $urls;
- foreach($urls as $url) {
- if (in_array($url[0], $interfaces)) return true;
- }
- return false;
+function has_urls(array $interfaces)
+{
+ global $urls;
+ foreach ($urls as $url) {
+ if (in_array($url[0], $interfaces)) {
+ return true;
+ }
+ }
+ return false;
}
// show all urls for a given list of interface
-function show_urls(array $interfaces) {
- global $urls;
- // 0 - type of url ['LAN','WLAN','WAN','WG','TAILSCALE']
- // 1 - the url
- // 3 - the url it redirects to, or null
- // 4 - the certificate file used, or null
- // 5 - self-signed certificate, or false
- $output = "";
- $linestart = " ";
- $lineend = " \n";
- $first = true;
- foreach($urls as $url) {
- if (in_array($url[0], $interfaces)) {
- $msg = "$url[1] ";
- if ($url[2]) $msg .= " "._("redirects to")." $url[2] ";
- if ($url[3]) $msg .= " "._("uses")." ".$url[3];
- if ($url[4]) $msg .= " ";
- // 2nd+ urls need leading $linestart
- $output .= ($first ? "" : $linestart).$msg.$lineend;
- $first = false;
+function show_urls(array $interfaces)
+{
+ global $urls;
+ // 0 - type of url ['LAN','WLAN','WAN','WG','TAILSCALE']
+ // 1 - the url
+ // 3 - the url it redirects to, or null
+ // 4 - the certificate file used, or null
+ // 5 - self-signed certificate, or false
+ $output = "";
+ $linestart = " ";
+ $lineend = " \n";
+ $first = true;
+ foreach ($urls as $url) {
+ if (in_array($url[0], $interfaces)) {
+ $msg = "$url[1] ";
+ if ($url[2]) {
+ $msg .= " "._("redirects to")." $url[2] ";
+ }
+ if ($url[3]) {
+ $msg .= " "._("uses")." ".$url[3];
+ }
+ $msg .= " ";
+ }
+ // 2nd+ urls need leading $linestart
+ $output .= ($first ? "" : $linestart).$msg.$lineend;
+ $first = false;
+ }
}
- }
- if ($first) {
- $output = "none";
- } else {
- // strip final trailing $lineend as it will be added by markdown
- $output = substr($output, 0, strlen($lineend)*-1);
- }
- echo $output;
+ if ($first) {
+ $output = "none";
+ } else {
+ // strip final trailing $lineend as it will be added by markdown
+ $output = substr($output, 0, strlen($lineend) * -1);
+ }
+ echo $output;
}
-$cert_time_format = $display['date'].($display['date']!='%c' ? ', '.str_replace(['%M','%R'],['%M:%S','%R:%S'],$display['time']):'');
+$cert_time_format = $display['date'].($display['date'] != '%c' ? ', '.str_replace(['%M','%R'], ['%M:%S','%R:%S'], $display['time']) : '');
$provisionlabel = $isWildcardCert ? _('Renew') : _('Provision');
-$disabled_provision = $keyfile===false || ($isWildcardCert && $retval_expired===0) || !$addr ? 'disabled' : '';
+$disabled_provision = $keyfile === false || ($isWildcardCert && $retval_expired === 0) || !$addr ? 'disabled' : '';
$disabled_provision_msg = !$addr ? _('Ensure the primary network card eth0 has an IP address.') : '';
-$disabled_delete = $cert2Present && $var['USE_SSL']!='auto' ? '' : 'disabled';
+$disabled_delete = $cert2Present && $var['USE_SSL'] != 'auto' ? '' : 'disabled';
$disabled_auto = $isWildcardCert && !$dnsRebindingProtection && $dnsValid ? '' : 'disabled';
// Get ports in use
@@ -246,14 +306,20 @@ exec("lsof -Pni|awk '/LISTEN/ && \$9!~/127.0.0.1/ && \$9!~/\\[::1\\]/{print \$9}
$bind = false; //= $var['BIND_MGT']=='yes'; - not used in 6.10
$list = ['*'];
-if ($addr) array_push($list, $addr);
+if ($addr) {
+ array_push($list, $addr);
+}
foreach ($output as $line) {
- [$ip, $port] = my_explode($line[0]=='[' ? ']:' : ':',$line);
- if ($ip[0]=='[') $ip = substr($ip,1); // ipv6 address
- if (!in_array($port,$portsInUse) && (!$bind || in_array($ip,$list))) $portsInUse[] = $port;
+ [$ip, $port] = my_explode($line[0] == '[' ? ']:' : ':', $line);
+ if ($ip[0] == '[') {
+ $ip = substr($ip, 1);
+ } // ipv6 address
+ if (!in_array($port, $portsInUse) && (!$bind || in_array($ip, $list))) {
+ $portsInUse[] = $port;
+ }
}
-sort($portsInUse,SORT_NUMERIC);
+sort($portsInUse, SORT_NUMERIC);
?>
diff --git a/emhttp/plugins/dynamix/NetworkRules.page b/emhttp/plugins/dynamix/NetworkRules.page
index 0bd8bcd62..aa5c1b257 100644
--- a/emhttp/plugins/dynamix/NetworkRules.page
+++ b/emhttp/plugins/dynamix/NetworkRules.page
@@ -71,7 +71,10 @@ _(Interface)_ :
-:
+
:eth_network_rules_help:
diff --git a/emhttp/plugins/dynamix/NewConfig.page b/emhttp/plugins/dynamix/NewConfig.page
index e4d3651ef..0f3205335 100644
--- a/emhttp/plugins/dynamix/NewConfig.page
+++ b/emhttp/plugins/dynamix/NewConfig.page
@@ -58,23 +58,34 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
:end
'.(is_file($enabledAgent) ? ''._("Enabled").' ' : ''._("Disabled").' ').' '.(is_file($enabledAgent) ? ''._("Enabled").' ' : ''._("Disabled").' ').'
-_(Time)_ _(Event)_ _(Subject)_ _(Description)_ _(Importance)_
+
+
+
+
+
+ _(Time)_
+ _(Event)_
+ _(Subject)_
+ _(Description)_
+ _(Importance)_
+
+
+
+
+
+
+
+
-_(Device)_ _(Identification)_ _(Temp)_ _(Reads)_ _(Writes)_ _(Errors)_ _(FS)_ _(Size)_ _(Used)_ _(Free)_
-
-
+
+
+
+
+ _(Device)_
+ _(Identification)_
+ _(Temp)_
+ _(Reads)_
+ _(Writes)_
+ _(Errors)_
+ _(FS)_
+ _(Size)_
+ _(Used)_
+ _(Free)_
+
+
+
+
+
+
_(Enable Outgoing Proxy)_
+_(Enable Outgoing Proxy)_
+:
+
_(Select Proxy)_:
-:
+:
@@ -88,16 +90,20 @@ _(Select Proxy)_:
> For a more comprehensive solution you might consider setting up _(VPN tunnel access for System)_ _(Outgoing Proxy)_ 1
+
+_(Outgoing Proxy)_ 1
+:
+
_(Name)_:
-:
+
+
+
+
+_(Outgoing Proxy)_ 3
+:
+
_(Name)_:
-:
+
-:
+
-
-_(Protocol)_ _(Route)_ _(Gateway)_ _(Metric)_ _(Delete)_
+
+
+
+
+ _(Protocol)_
+ _(Route)_
+ _(Gateway)_
+ _(Metric)_
+ _(Delete)_
+
+
+
+
diff --git a/emhttp/plugins/dynamix/SMBActiveDirectory.page b/emhttp/plugins/dynamix/SMBActiveDirectory.page
index 1952ae5bf..8f6d4d164 100644
--- a/emhttp/plugins/dynamix/SMBActiveDirectory.page
+++ b/emhttp/plugins/dynamix/SMBActiveDirectory.page
@@ -48,5 +48,8 @@ _(AD initial group)_:
:
+
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix/SMBExtras.page b/emhttp/plugins/dynamix/SMBExtras.page
index ffeeaefc9..483b78a16 100644
--- a/emhttp/plugins/dynamix/SMBExtras.page
+++ b/emhttp/plugins/dynamix/SMBExtras.page
@@ -36,7 +36,11 @@ _(Samba extra configuration)_:
:
-:
+
+*_(Array must be **Stopped** to change)_*
:smb_extra_button_help:
diff --git a/emhttp/plugins/dynamix/SMBWorkGroup.page b/emhttp/plugins/dynamix/SMBWorkGroup.page
index 7d0ceaf94..279fb27d1 100644
--- a/emhttp/plugins/dynamix/SMBWorkGroup.page
+++ b/emhttp/plugins/dynamix/SMBWorkGroup.page
@@ -32,5 +32,9 @@ _(Local master)_:
-:
+
+*_(Array must be **Stopped** to change)_*
diff --git a/emhttp/plugins/dynamix/SMBsettings.page b/emhttp/plugins/dynamix/SMBsettings.page
index 8f1587237..f7e4a6f8e 100644
--- a/emhttp/plugins/dynamix/SMBsettings.page
+++ b/emhttp/plugins/dynamix/SMBsettings.page
@@ -71,7 +71,11 @@ _(WSD options [experimental])_:
:smb_wsd_options_help:
-:
+
+*_(Array must be **Stopped** to change)_*
-
- title="_(Set default boot menu)_" onchange="changeMenu(this.form,this.id,true)">
-
+?>
+
+
+ title="_(Set default boot menu)_" onchange="changeMenu(this.form,this.id,true)">
+
+
+
+
+
_(Syslinux configuration)_:
-:
+:
_(Server boot mode)_:
:
-_(Permit UEFI boot mode)_
>
-: *_(Boot system in UEFI mode)_. _(Please check your system settings to support UEFI boot mode)_.*
+_(Boot system in UEFI mode)_:
+:
+
+ *_(Please check your system settings to support UEFI boot mode)_.*
-:
+:
+
:syslinux_button_help:
diff --git a/emhttp/plugins/dynamix/SyslogSettings.page b/emhttp/plugins/dynamix/SyslogSettings.page
index 0914c7088..16b613a9c 100644
--- a/emhttp/plugins/dynamix/SyslogSettings.page
+++ b/emhttp/plugins/dynamix/SyslogSettings.page
@@ -181,5 +181,8 @@ _(Copy syslog to flash on shutdown)_:
:syslog_shutdown_flash_help:
-:
+:
+
diff --git a/emhttp/plugins/dynamix/TrimSettings.page b/emhttp/plugins/dynamix/TrimSettings.page
index 8cb8807af..ec77ca257 100644
--- a/emhttp/plugins/dynamix/TrimSettings.page
+++ b/emhttp/plugins/dynamix/TrimSettings.page
@@ -123,5 +123,9 @@ _(Time of the day)_:
:end
-:
+:
+
diff --git a/emhttp/plugins/dynamix/UserAdd.page b/emhttp/plugins/dynamix/UserAdd.page
index e32f64c22..3e542e540 100644
--- a/emhttp/plugins/dynamix/UserAdd.page
+++ b/emhttp/plugins/dynamix/UserAdd.page
@@ -156,21 +156,28 @@ _(Description)_:
:user_add_description_help:
_(Custom image)_:
-:
_(Drag-n-drop a PNG file or click the image at the left)_
+:
+ _(Drag-n-drop a PNG file or click the image at the left)_
+
:user_add_custom_image_help:
_(Password)_:
-
-:
+:
+
:user_password_help:
_(Retype password)_:
-
-:
+:
+
-:
+:
+
diff --git a/emhttp/plugins/dynamix/UserEdit.page b/emhttp/plugins/dynamix/UserEdit.page
index ad044a999..498976d20 100644
--- a/emhttp/plugins/dynamix/UserEdit.page
+++ b/emhttp/plugins/dynamix/UserEdit.page
@@ -169,6 +169,7 @@ $(function(){
@@ -318,6 +333,9 @@ echo "";
?>
-:
+:
+
diff --git a/emhttp/plugins/dynamix/UserList.page b/emhttp/plugins/dynamix/UserList.page
index 963e6ee6a..806a3235b 100644
--- a/emhttp/plugins/dynamix/UserList.page
+++ b/emhttp/plugins/dynamix/UserList.page
@@ -13,26 +13,48 @@ Tag="users"
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*/
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-_(No users are defined)_. _(Click **Add User** to create a user for remote shares access)_
+
+
+
+
+
+
+
+
+
+
+
_(No users are defined)_. _(Click **Add User** to create a user for remote shares access)_
+
+
-
-
diff --git a/emhttp/plugins/dynamix/WG0.page b/emhttp/plugins/dynamix/WG0.page
index e21ac8820..23d2e3b58 100644
--- a/emhttp/plugins/dynamix/WG0.page
+++ b/emhttp/plugins/dynamix/WG0.page
@@ -503,6 +503,7 @@ function clearTunnel(vtun) {
}
function addTunnel() {
+ console.log('addTunnel');
$.post('/webGui/include/update.wireguard.php',{'#cmd':'addtunnel','#name':''},function(){refresh();});
}
@@ -1048,20 +1049,20 @@ function getPublicIP(ip,wg,protocol) {
var ext_ipv6 = ips[3];
if ((protocol==''||protocol=='46') && ext_ipv4 && ip) {
if (!wgx_ipv4) {
- if (!wgx_ipv6) $('#endpoint4-'+wg).html("
_(Remark)_: _(The Local endpoint does not resolve to an IPv4 address)_. _(In most cases, this should be your public WAN IPv4)_: "+ext_ipv4+" \n").show();
+ if (!wgx_ipv6) $('#endpoint4-'+wg).html("
_(Remark)_: _(The Local endpoint does not resolve to an IPv4 address)_. _(In most cases, this should be your public WAN IPv4)_: "+ext_ipv4+" \n").show();
} else if (wgx_ipv4 != ext_ipv4) {
- $('#endpoint4-'+wg).html("
_(Remark)_: _(The Local endpoint resolves to)_ "+wgx_ipv4+". _(In most cases, this should be your public WAN IPv4 instead)_: "+ext_ipv4+" \n").show();
+ $('#endpoint4-'+wg).html("
_(Remark)_: _(The Local endpoint resolves to)_ "+wgx_ipv4+". _(In most cases, this should be your public WAN IPv4 instead)_: "+ext_ipv4+" \n").show();
} else if (endpoints.includes(wgx_ipv4) && isPublic(wgx_ipv4)) {
- $('#endpoint4-'+wg).html("
_(Remark)_: _(The Local endpoint resolves to)_ "+wgx_ipv4+". _(Your Unraid Server is reachable from the internet)_ \n").show();
+ $('#endpoint4-'+wg).html("
_(Remark)_: _(The Local endpoint resolves to)_ "+wgx_ipv4+". _(Your Unraid Server is reachable from the internet)_ \n").show();
}
}
if ((protocol=='6'||protocol=='46') && ext_ipv6 && ip) {
if (!wgx_ipv6) {
- if (!wgx_ipv4) $('#endpoint6-'+wg).html("
_(Remark)_: _(The Local endpoint does not resolve to an IPv6 address)_. _(In most cases, this should be your public WAN IPv6)_: "+ext_ipv6+" \n").show();
+ if (!wgx_ipv4) $('#endpoint6-'+wg).html("
_(Remark)_: _(The Local endpoint does not resolve to an IPv6 address)_. _(In most cases, this should be your public WAN IPv6)_: "+ext_ipv6+" \n").show();
} else if (wgx_ipv6 != ext_ipv6) {
- $('#endpoint6-'+wg).html("
_(Remark)_: _(The Local endpoint resolves to)_ "+wgx_ipv6+". _(In most cases, this should be your public WAN IPv6 instead)_: "+ext_ipv6+" \n").show();
+ $('#endpoint6-'+wg).html("
_(Remark)_: _(The Local endpoint resolves to)_ "+wgx_ipv6+". _(In most cases, this should be your public WAN IPv6 instead)_: "+ext_ipv6+" \n").show();
} else if (endpoints.includes(wgx_ipv6)) {
- $('#endpoint6-'+wg).html("
_(Remark)_: _(The Local endpoint resolves to)_ "+wgx_ipv6+". _(Your Unraid Server is reachable from the internet)_ \n").show();
+ $('#endpoint6-'+wg).html("
_(Remark)_: _(The Local endpoint resolves to)_ "+wgx_ipv6+". _(Your Unraid Server is reachable from the internet)_ \n").show();
}
}
@@ -1111,14 +1112,16 @@ statistics.on('message', function(data) {
$(function(){
var form = $(document.wg0);
- var ctrl = "
";
- ctrl += "
_(Autostart)_ ";
- ctrl += "
";
- ctrl += "
";
+ var ctrl = "
";
+ ctrl += "_(Autostart)_ ";
statistics.start();
getPublicIP($('#endpoint-wg0').val(),'wg0',$('#protocol-wg0').val());
- $('div.content').prepend('
');
- $('div.title').eq(0).find('span.left').append(ctrl);
+ $('div.content').prepend('
');
+ $('div.title').eq(0).find('.right').append(ctrl);
$.post('/webGui/include/update.wireguard.php',{'#cmd':'upnp','#gw':"",'#link':""},function(url){
if (url) {
$('div.upnp').show();
@@ -1265,30 +1268,40 @@ $(function(){
+
_(Local name)_:
-:
-
+:
+
+
+
:wg_local_name_help:
-
':'>'?>
+
_(Local private key)_:
-:
+
:wg_generate_keypair_help:
_(Local public key)_:
-:
+
:wg_generate_keypair_help:
_(Local endpoint)_:
-:
-
-
+:
+ :
+
+
+
+
+
:wg_local_endpoint_help:
_(Local server uses NAT)_:
-:
+:
-
-
_(Remark)_: _(configure your router with a static route of)_ **** _(to)_ **** _(Remark)_: _(docker containers on custom networks need static routing)_ **** _(to)_ ****
+
+
_(Remark)_: _(configure your router with a static route of)_ **** _(to)_ ****
+
_(Remark)_: _(docker containers on custom networks need static routing)_ **** _(to)_ ****
:wg_local_server_uses_nat_help:
_(Local gateway uses UPnP)_:
-:
+:
-
_(Local tunnel firewall)_:
-:
- _(Rule)_:
-
-
-
+:
+
+ _(Rule)_:
+
+
+
+
+
+
:wg_local_tunnel_firewall_help:
_(MTU size)_:
-:
+:
+ _(bytes)_
+
:wg_mtu_size_help:
@@ -1387,16 +1420,22 @@ _(DNS servers)_:
_(Peer name)_:
-:
-
-
" style="cursor:pointer" onclick="WGconfig(this,'peer--wg0-','/peers')" title="_(View Peer Config)_">
- " style="cursor:pointer" onclick="openClose($(document.wg0),null,'div.key')" title="_(Toggle keys)_">
-
+:
+
+ " style="cursor:pointer" onclick="WGconfig(this,'peer--wg0-','/peers')" title="_(View Peer Config)_">
+ " style="cursor:pointer" onclick="openClose($(document.wg0),null,'div.key')" title="_(Toggle keys)_">
+
+
+
+
:wg_peer_name_help:
_(Peer type of access)_:
-:
+:
@@ -1406,7 +1445,7 @@ _(Peer type of access)_:
-
+
@@ -1415,19 +1454,23 @@ _(Peer type of access)_:
':'>'?>
_(Peer private key)_:
-:
-
+:
" onchange="highlight($(document.wg0),this,)" placeholder="(_(optional)_)">
+
+
:wg_generate_keypair_help:
_(Peer public key)_:
-:
+:
" onchange="highlight($(document.wg0),this,)" placeholder="(_(mandatory)_)" required>
:wg_generate_keypair_help:
_(Peer preshared key)_:
-:
-
+:
" onchange="highlight($(document.wg0),this,)" placeholder="(_(optional)_)">
+
+
:wg_peer_preshared_key_help:
@@ -1435,64 +1478,89 @@ _(Peer preshared key)_:
_(Peer tunnel address)_:
-:
+
_(Peer tunnel address IPv6)_:
-:
+
:wg_peer_tunnel_address_help:
_(Peer endpoint)_:
-
-:
-
>
+:
+
+ :
+
+
+
:wg_peer_endpoint_help:
_(Peer allowed IPs)_:
-:
+:
" onchange="quickValidate(this);" pattern="" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_, _(CIDR optional)_" placeholder="(_(mandatory)_)" required>
:wg_peer_allowed_ips_help:
_(Peer DNS server)_:
-:
+:
" onchange="quickValidate(this);" pattern="" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_" >
:wg_peer_dns_server_help:
_(Persistent keepalive)_:
-:
+:
+ _(seconds)_
+
:wg_persistent_keepalive_help:
+
+_(Data received)_:
+:
0 B
+
+_(Data sent)_:
+:
0 B
+
+_(Last handshake)_:
+:
_(unknown)_
_(Data received)_: 0 B _(Data sent)_: 0 B _(unknown)_
-:
+
-"WireGuard" and the "WireGuard" logo are registered trademarks of Jason A. Donenfeld