|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: mattermost-server-5.20.2/Makefile
|
|
|
|
|
--- mattermost-server-5.20.2/Makefile.orig 2019-10-16 18:25:22.000000000 +0200
|
|
|
|
|
+++ mattermost-server-5.20.2/Makefile 2019-10-20 10:57:31.720667000 +0200
|
|
|
|
|
@@ -6,13 +6,13 @@
|
|
|
|
|
Index: mattermost-server-5.22.0/Makefile
|
|
|
|
|
--- mattermost-server-5.22.0/Makefile.orig 2020-04-15 10:38:57.000000000 +0200
|
|
|
|
|
+++ mattermost-server-5.22.0/Makefile 2020-04-17 10:22:29.241853000 +0200
|
|
|
|
|
@@ -13,13 +13,13 @@
|
|
|
|
|
# Build Flags
|
|
|
|
|
BUILD_NUMBER ?= $(BUILD_NUMBER:)
|
|
|
|
|
BUILD_DATE = $(shell date -u)
|
|
|
|
@ -17,12 +17,12 @@ Index: mattermost-server-5.20.2/Makefile
|
|
|
|
|
BUILD_ENTERPRISE_READY = false
|
|
|
|
|
BUILD_TYPE_NAME = team
|
|
|
|
|
BUILD_HASH_ENTERPRISE = none
|
|
|
|
|
Index: mattermost-server-5.20.2/build/release.mk
|
|
|
|
|
--- mattermost-server-5.20.2/build/release.mk.orig 2019-10-16 18:25:22.000000000 +0200
|
|
|
|
|
+++ mattermost-server-5.20.2/build/release.mk 2019-10-20 10:57:31.720824000 +0200
|
|
|
|
|
@@ -13,7 +13,8 @@
|
|
|
|
|
@echo Build Windows amd64
|
|
|
|
|
env GOOS=windows GOARCH=amd64 $(GO) install -i $(GOFLAGS) -ldflags '$(LDFLAGS)' ./...
|
|
|
|
|
Index: mattermost-server-5.22.0/build/release.mk
|
|
|
|
|
--- mattermost-server-5.22.0/build/release.mk.orig 2020-04-15 10:38:57.000000000 +0200
|
|
|
|
|
+++ mattermost-server-5.22.0/build/release.mk 2020-04-17 10:22:29.242030000 +0200
|
|
|
|
|
@@ -28,7 +28,8 @@
|
|
|
|
|
env GOOS=windows GOARCH=amd64 $(GO) build -o $(GOBIN)/windows_amd64 $(GOFLAGS) -trimpath -ldflags '$(LDFLAGS)' ./...
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-build: build-linux build-windows build-osx
|
|
|
|
|
+build:
|
|
|
|
@ -31,8 +31,8 @@ Index: mattermost-server-5.20.2/build/release.mk
|
|
|
|
|
build-client:
|
|
|
|
|
@echo Building mattermost web app
|
|
|
|
|
Index: mattermost/config/config.json
|
|
|
|
|
--- mattermost/config/config.json.orig 2019-10-17 01:08:43.000000000 +0200
|
|
|
|
|
+++ mattermost/config/config.json 2019-10-20 10:58:38.806270000 +0200
|
|
|
|
|
--- mattermost/config/config.json.orig 2020-04-16 00:25:50.000000000 +0200
|
|
|
|
|
+++ mattermost/config/config.json 2020-04-17 10:45:25.935985000 +0200
|
|
|
|
|
@@ -1,9 +1,9 @@
|
|
|
|
|
{
|
|
|
|
|
"ServiceSettings": {
|
|
|
|
@ -45,7 +45,7 @@ Index: mattermost/config/config.json
|
|
|
|
|
"ConnectionSecurity": "",
|
|
|
|
|
"TLSCertFile": "",
|
|
|
|
|
"TLSKeyFile": "",
|
|
|
|
|
@@ -127,8 +127,8 @@
|
|
|
|
|
@@ -131,8 +131,8 @@
|
|
|
|
|
"IosMinVersion": ""
|
|
|
|
|
},
|
|
|
|
|
"SqlSettings": {
|
|
|
|
@ -56,7 +56,7 @@ Index: mattermost/config/config.json
|
|
|
|
|
"DataSourceReplicas": [],
|
|
|
|
|
"DataSourceSearchReplicas": [],
|
|
|
|
|
"MaxIdleConns": 20,
|
|
|
|
|
@@ -171,7 +171,7 @@
|
|
|
|
|
@@ -191,7 +191,7 @@
|
|
|
|
|
"EnableMobileDownload": true,
|
|
|
|
|
"MaxFileSize": 52428800,
|
|
|
|
|
"DriverName": "local",
|
|
|
|
@ -65,7 +65,7 @@ Index: mattermost/config/config.json
|
|
|
|
|
"EnablePublicLink": false,
|
|
|
|
|
"PublicLinkSalt": "",
|
|
|
|
|
"InitialFont": "nunito-bold.ttf",
|
|
|
|
|
@@ -192,15 +192,15 @@
|
|
|
|
|
@@ -212,15 +212,15 @@
|
|
|
|
|
"SendEmailNotifications": false,
|
|
|
|
|
"UseChannelInEmailNotifications": false,
|
|
|
|
|
"RequireEmailVerification": false,
|
|
|
|
@ -84,10 +84,10 @@ Index: mattermost/config/config.json
|
|
|
|
|
- "SMTPPort": "10025",
|
|
|
|
|
+ "SMTPServer": "127.0.0.1",
|
|
|
|
|
+ "SMTPPort": "25",
|
|
|
|
|
"SMTPServerTimeout": 10,
|
|
|
|
|
"ConnectionSecurity": "",
|
|
|
|
|
"SendPushNotifications": true,
|
|
|
|
|
"PushNotificationServer": "https://push-test.mattermost.com",
|
|
|
|
|
@@ -208,7 +208,7 @@
|
|
|
|
|
@@ -229,7 +229,7 @@
|
|
|
|
|
"EnableEmailBatching": false,
|
|
|
|
|
"EmailBatchingBufferSize": 256,
|
|
|
|
|
"EmailBatchingInterval": 30,
|
|
|
|
@ -96,7 +96,7 @@ Index: mattermost/config/config.json
|
|
|
|
|
"SkipServerCertificateVerification": false,
|
|
|
|
|
"EmailNotificationContentsType": "full",
|
|
|
|
|
"LoginButtonColor": "#0000",
|
|
|
|
|
@@ -311,7 +311,7 @@
|
|
|
|
|
@@ -336,7 +336,7 @@
|
|
|
|
|
},
|
|
|
|
|
"ComplianceSettings": {
|
|
|
|
|
"Enable": false,
|
|
|
|
@ -105,7 +105,7 @@ Index: mattermost/config/config.json
|
|
|
|
|
"EnableDaily": false
|
|
|
|
|
},
|
|
|
|
|
"LocalizationSettings": {
|
|
|
|
|
@@ -384,9 +384,9 @@
|
|
|
|
|
@@ -416,9 +416,9 @@
|
|
|
|
|
"MaxUsersForStatistics": 2500
|
|
|
|
|
},
|
|
|
|
|
"ElasticsearchSettings": {
|
|
|
|
@ -117,7 +117,7 @@ Index: mattermost/config/config.json
|
|
|
|
|
"EnableIndexing": false,
|
|
|
|
|
"EnableSearching": false,
|
|
|
|
|
"EnableAutocomplete": false,
|
|
|
|
|
@@ -435,8 +435,8 @@
|
|
|
|
|
@@ -467,8 +467,8 @@
|
|
|
|
|
"EnableUploads": false,
|
|
|
|
|
"AllowInsecureDownloadUrl": false,
|
|
|
|
|
"EnableHealthCheck": true,
|
|
|
|
@ -128,7 +128,7 @@ Index: mattermost/config/config.json
|
|
|
|
|
"Plugins": {},
|
|
|
|
|
"PluginStates": {
|
|
|
|
|
"com.mattermost.nps": {
|
|
|
|
|
@@ -462,4 +462,4 @@
|
|
|
|
|
@@ -498,4 +498,4 @@
|
|
|
|
|
"RemoteImageProxyURL": "",
|
|
|
|
|
"RemoteImageProxyOptions": ""
|
|
|
|
|
}
|
|
|
|
|