mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
fix for dockerhost HELIUM
This commit is contained in:
@@ -303,6 +303,10 @@ func IsTestDomain(r *http.Request) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
if strings.Index(r.Host, "dockerhost") == 0 {
|
||||
return true
|
||||
}
|
||||
|
||||
if strings.Index(r.Host, "test") == 0 {
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"LogSettings": {
|
||||
"ConsoleEnable": false,
|
||||
"ConsoleLevel": "DEBUG",
|
||||
"ConsoleEnable": true,
|
||||
"ConsoleLevel": "INFO",
|
||||
"FileEnable": true,
|
||||
"FileLevel": "INFO",
|
||||
"FileFormat": "",
|
||||
|
||||
@@ -160,6 +160,7 @@ var reservedDomains = []string{
|
||||
"channel",
|
||||
"internal",
|
||||
"localhost",
|
||||
"dockerhost",
|
||||
"stag",
|
||||
"post",
|
||||
"cluster",
|
||||
|
||||
@@ -61,6 +61,7 @@ module.exports = {
|
||||
"channel",
|
||||
"internal",
|
||||
"localhost",
|
||||
"dockerhost",
|
||||
"stag",
|
||||
"post",
|
||||
"cluster",
|
||||
|
||||
@@ -28,6 +28,9 @@ module.exports.isTestDomain = function() {
|
||||
if ((/^localhost/).test(window.location.hostname))
|
||||
return true;
|
||||
|
||||
if ((/^dockerhost/).test(window.location.hostname))
|
||||
return true;
|
||||
|
||||
if ((/^test/).test(window.location.hostname))
|
||||
return true;
|
||||
|
||||
@@ -75,8 +78,14 @@ module.exports.getDomainWithOutSub = function() {
|
||||
|
||||
var parts = window.location.host.split(".");
|
||||
|
||||
if (parts.length == 1)
|
||||
return "localhost:8065";
|
||||
if (parts.length == 1) {
|
||||
if (parts[0].indexOf("dockerhost") > -1) {
|
||||
return "dockerhost:8065";
|
||||
}
|
||||
else {
|
||||
return "localhost:8065";
|
||||
}
|
||||
}
|
||||
|
||||
return parts[1] + "." + parts[2];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user