IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-27 05:37:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Using config.json instead of config_docker.json for docker. Note, this will break local dev builds.

Browse Source
This commit is contained in:
Christopher Speller
2015-06-16 19:46:56 -04:00
parent 43a35119d4
commit e022e87b66
3 changed files with 10 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.json
+6 -6
View File
@@ -8,12 +8,12 @@
"FileLocation": ""
},
"ServiceSettings": {
"SiteName": "XXXXXXMustBeFilledIn",
"Domain": "xxxxxxmustbefilledin.com",
"Mode" : "dev",
"SiteName": "Mattermost Preview",
"Domain": "",
"Mode" : "prod",
"AllowTesting" : false,
"UseSSL": false,
"Port": "8065",
"Port": "80",
"Version": "developer",
"Shards": {
},
@@ -56,8 +56,8 @@
"EmailSettings": {
"SMTPUsername": "",
"SMTPPassword": "",
"SMTPServer": "",
"UseTLS": true,
"SMTPServer": "localhost:25",
"UseTLS": false,
"FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
"FeedbackName": "",
"ApplePushServer": "",
config/config_docker.json
-84
View File
@@ -1,84 +0,0 @@
{
"LogSettings": {
"ConsoleEnable": true,
"ConsoleLevel": "DEBUG",
"FileEnable": true,
"FileLevel": "INFO",
"FileFormat": "",
"FileLocation": ""
},
"ServiceSettings": {
"SiteName": "Mattermost Preview",
"Domain": "",
"Mode" : "prod",
"AllowTesting" : false,
"UseSSL": false,
"Port": "80",
"Version": "developer",
"Shards": {
},
"InviteSalt": "4nAN4CuEJQ4G73RPA9DJrcVkbrGIE9SX",
"PublicLinkSalt": "zBXCZvnXQ5aRfzqPHgrK5G6wunsPzimE",
"ResetSalt": "GcloaPC5tjGCzwXApNJ23oSLUoP8LXQ4",
"AnalyticsUrl": ""
},
"SqlSettings": {
"DriverName": "mysql",
"DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test",
"DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test"],
"MaxIdleConns": 10,
"MaxOpenConns": 10,
"Trace": false,
"AtRestEncryptKey": "4Uuoy2t1S204JUKXHGfALJL2J5q3jlEH"
},
"RedisSettings": {
"DataSource": "localhost:6379",
"MaxOpenConns": 100
},
"AWSSettings": {
"S3AccessKeyId": "",
"S3SecretAccessKey": "",
"S3Bucket": "",
"S3Region": "",
"Route53AccessKeyId": "",
"Route53SecretAccessKey": "",
"Route53ZoneId": "",
"Route53Region": ""
},
"ImageSettings": {
"ThumbnailWidth": 200,
"ThumbnailHeight": 0,
"PreviewWidth": 1024,
"PreviewHeight": 0,
"ProfileWidth": 128,
"ProfileHeight": 128
},
"EmailSettings": {
"SMTPUsername": "",
"SMTPPassword": "",
"SMTPServer": "localhost:25",
"UseTLS": false,
"FeedbackEmail": "feedback@mattermost.com",
"FeedbackName": "",
"ApplePushServer": "",
"ApplePushCertPublic": "",
"ApplePushCertPrivate":""
},
"PrivacySettings": {
"ShowEmailAddress": false,
"ShowPhoneNumber": false,
"ShowSkypeId": false,
"ShowFullName": false
},
"TeamSettings": {
"MaxUsersPerTeam": 150,
"AllowPublicLink": true,
"TermsLink": "/static/help/configure_links.html",
"PrivacyLink": "/static/help/configure_links.html",
"AboutLink": "/static/help/configure_links.html",
"HelpLink": "/static/help/configure_links.html",
"ReportProblemLink": "/static/help/configure_links.html",
"TourLink": "/static/help/configure_links.html",
"DefaultThemeColor": "#2389D7"
}
}
docker-entry.sh
+4 -1
View File
@@ -2,6 +2,9 @@
mkdir -p web/static/js
echo "127.0.0.1 dockerhost" >> /etc/hosts
/etc/init.d/networking restart
echo configuring mysql
# SQL!!!
@@ -111,7 +114,7 @@ echo starting react processor
cd /go/src/github.com/mattermost/platform/web/react && npm start &
echo starting go web server
cd /go/src/github.com/mattermost/platform/; go run mattermost.go -config=config_docker.json &
cd /go/src/github.com/mattermost/platform/; go run mattermost.go -config=config.json &
echo starting compass watch
cd /go/src/github.com/mattermost/platform/web/sass-files && compass watch