mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Merge pull request #882 from mattermost/PLT-499

Просмотр исходного кода 
PLT-499 fixing broken salts
Этот коммит содержится в:
Harrison Healey
2015-09-30 13:44:20 -04:00
родитель 7a760481c3 742ddbeaf5
Коммит 0a9d93974f
3 изменённых файлов: 12 добавлений и 12 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
docker/1.0/config_docker.json
Просмотреть файл

@@ -22,7 +22,7 @@
"MaxIdleConns": 10, "MaxIdleConns": 10,
"MaxOpenConns": 10, "MaxOpenConns": 10,
"Trace": false, "Trace": false,
"AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV" "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QVg"
}, },
"LogSettings": { "LogSettings": {
"EnableConsole": false, "EnableConsole": false,
@@ -36,7 +36,7 @@
"DriverName": "local", "DriverName": "local",
"Directory": "/mattermost/data/", "Directory": "/mattermost/data/",
"EnablePublicLink": true, "EnablePublicLink": true,
"PublicLinkSalt": "LhaAWC6lYEKHTkBKsvyXNIOfUIT37AX", "PublicLinkSalt": "A705AklYF8MFDOfcwh3I488G8vtLlVip",
"ThumbnailWidth": 120, "ThumbnailWidth": 120,
"ThumbnailHeight": 100, "ThumbnailHeight": 100,
"PreviewWidth": 1024, "PreviewWidth": 1024,
@@ -60,8 +60,8 @@
"SMTPServer": "", "SMTPServer": "",
"SMTPPort": "", "SMTPPort": "",
"ConnectionSecurity": "", "ConnectionSecurity": "",
"InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo", "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS",
"PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5e", "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL",
"ApplePushServer": "", "ApplePushServer": "",
"ApplePushCertPublic": "", "ApplePushCertPublic": "",
"ApplePushCertPrivate": "" "ApplePushCertPrivate": ""

8
docker/dev/config_docker.json
Просмотреть файл

@@ -22,7 +22,7 @@
"MaxIdleConns": 10, "MaxIdleConns": 10,
"MaxOpenConns": 10, "MaxOpenConns": 10,
"Trace": false, "Trace": false,
"AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV" "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QVg"
}, },
"LogSettings": { "LogSettings": {
"EnableConsole": false, "EnableConsole": false,
@@ -36,7 +36,7 @@
"DriverName": "local", "DriverName": "local",
"Directory": "/mattermost/data/", "Directory": "/mattermost/data/",
"EnablePublicLink": true, "EnablePublicLink": true,
"PublicLinkSalt": "LhaAWC6lYEKHTkBKsvyXNIOfUIT37AX", "PublicLinkSalt": "A705AklYF8MFDOfcwh3I488G8vtLlVip",
"ThumbnailWidth": 120, "ThumbnailWidth": 120,
"ThumbnailHeight": 100, "ThumbnailHeight": 100,
"PreviewWidth": 1024, "PreviewWidth": 1024,
@@ -60,8 +60,8 @@
"SMTPServer": "", "SMTPServer": "",
"SMTPPort": "", "SMTPPort": "",
"ConnectionSecurity": "", "ConnectionSecurity": "",
"InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo", "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS",
"PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5e", "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL",
"ApplePushServer": "", "ApplePushServer": "",
"ApplePushCertPublic": "", "ApplePushCertPublic": "",
"ApplePushCertPrivate": "" "ApplePushCertPrivate": ""

8
docker/local/config_docker.json
Просмотреть файл

@@ -22,7 +22,7 @@
"MaxIdleConns": 10, "MaxIdleConns": 10,
"MaxOpenConns": 10, "MaxOpenConns": 10,
"Trace": false, "Trace": false,
"AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV" "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QVg"
}, },
"LogSettings": { "LogSettings": {
"EnableConsole": false, "EnableConsole": false,
@@ -36,7 +36,7 @@
"DriverName": "local", "DriverName": "local",
"Directory": "/mattermost/data/", "Directory": "/mattermost/data/",
"EnablePublicLink": true, "EnablePublicLink": true,
"PublicLinkSalt": "LhaAWC6lYEKHTkBKsvyXNIOfUIT37AX", "PublicLinkSalt": "A705AklYF8MFDOfcwh3I488G8vtLlVip",
"ThumbnailWidth": 120, "ThumbnailWidth": 120,
"ThumbnailHeight": 100, "ThumbnailHeight": 100,
"PreviewWidth": 1024, "PreviewWidth": 1024,
@@ -60,8 +60,8 @@
"SMTPServer": "", "SMTPServer": "",
"SMTPPort": "", "SMTPPort": "",
"ConnectionSecurity": "", "ConnectionSecurity": "",
"InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo", "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS",
"PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5e", "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL",
"ApplePushServer": "", "ApplePushServer": "",
"ApplePushCertPublic": "", "ApplePushCertPublic": "",
"ApplePushCertPrivate": "" "ApplePushCertPrivate": ""