yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/integration-tests-examine-indexes

Browse Source
This commit is contained in:
Shannon
2020-09-02 18:27:53 +10:00
parent a5772f10e1 edca4af7f4
commit 775360ef78
2 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/Umbraco.Web.UI.NetCore/appsettings.json
View File

@@ -1,60 +1,60 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"umbracoDbDSN": "" "umbracoDbDSN": ""
}, },
"Umbraco": { "Umbraco": {
"CMS": { "CMS": {
"Content": { "Content": {
"Notifications": { "Notifications": {
"Email": "your@email.here" "Email": "your@email.here"
}, },
"MacroErrors": "throw" "MacroErrors": "throw"
}, },
"Global": { "Global": {
"DefaultUILanguage": "en-us", "DefaultUILanguage": "en-us",
"HideTopLevelNodeFromPath": true, "HideTopLevelNodeFromPath": true,
"Path": "~/umbraco", "Path": "~/umbraco",
"TimeOutInMinutes": 20, "TimeOutInMinutes": 20,
"UseHttps": false "UseHttps": false
}, },
"Hosting": { "Hosting": {
"Debug": false "Debug": false
}, },
"KeepAlive": { "KeepAlive": {
"DisableKeepAliveTask": false, "DisableKeepAliveTask": false,
"KeepAlivePingUrl": "{umbracoApplicationUrl}/api/keepalive/ping" "KeepAlivePingUrl": "{umbracoApplicationUrl}/api/keepalive/ping"
}, },
"RequestHandler": { "RequestHandler": {
"ConvertUrlsToAscii": "try" "ConvertUrlsToAscii": "try"
}, },
"RuntimeMinification": { "RuntimeMinification": {
"dataFolder": "App_Data\\Smidge", "dataFolder": "App_Data\\Smidge",
"version": "1" "version": "1"
}, },
"Security": { "Security": {
"KeepUserLoggedIn": false, "KeepUserLoggedIn": false,
"UsernameIsEmail": true, "UsernameIsEmail": true,
"HideDisabledUsersInBackoffice": false, "HideDisabledUsersInBackoffice": false,
"UserPassword": { "UserPassword": {
"RequiredLength": 10, "RequiredLength": 10,
"RequireNonLetterOrDigit": false, "RequireNonLetterOrDigit": false,
"RequireDigit": false, "RequireDigit": false,
"RequireLowercase": false, "RequireLowercase": false,
"RequireUppercase": false, "RequireUppercase": false,
"MaxFailedAccessAttemptsBeforeLockout": 0 "MaxFailedAccessAttemptsBeforeLockout": 5
}, },
"MemberPassword": { "MemberPassword": {
"RequiredLength": 10, "RequiredLength": 10,
"RequireNonLetterOrDigit": false, "RequireNonLetterOrDigit": false,
"RequireDigit": false, "RequireDigit": false,
"RequireLowercase": false, "RequireLowercase": false,
"RequireUppercase": false, "RequireUppercase": false,
"MaxFailedAccessAttemptsBeforeLockout": 0 "MaxFailedAccessAttemptsBeforeLockout": 5
}
},
"Tours": {
"EnableTours": true
}
} }
},
"Tours": {
"EnableTours": true
}
} }
}
} }

2
src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
View File

@@ -73,7 +73,7 @@ namespace Umbraco.Web.Editors
//this is the filter for the keys that we'll keep based on the full version of the server vars //this is the filter for the keys that we'll keep based on the full version of the server vars
var keepOnlyKeys = new Dictionary<string, string[]> var keepOnlyKeys = new Dictionary<string, string[]>
{ {
{"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl"}}, {"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl", "iconApiBaseUrl"}},
{"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage", "canSendRequiredEmail", "usernameIsEmail"}}, {"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage", "canSendRequiredEmail", "usernameIsEmail"}},
{"application", new[] {"applicationPath", "cacheBuster"}}, {"application", new[] {"applicationPath", "cacheBuster"}},
{"isDebuggingEnabled", new string[] { }}, {"isDebuggingEnabled", new string[] { }},