Added mysql stuff and advanced logging

This commit is contained in:
coltoneshaw
2023-05-26 10:44:28 -04:00
parent b3776630ba
commit 79f82e17ed
3 changed files with 35 additions and 6 deletions

View File

@@ -1,6 +1,31 @@
version: "3.9" version: "3.9"
services: services:
# mysql:
# container_name: cs-repro-mysql
# image: mysql:8
# restart: always
# environment:
# MYSQL_DATABASE: "mattermost"
# # So you don't have to use root, but you can if you like
# MYSQL_USER: "mmuser"
# # You can use whatever password you like
# MYSQL_PASSWORD: "mmuser_password"
# # Password for root access
# MYSQL_ROOT_PASSWORD: "mmuser_password"
# healthcheck:
# test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
# timeout: 20s
# retries: 10
# ports:
# # <Port exposed> : <MySQL Port running inside container>
# - "3306:3306"
# expose:
# # Opens port 3306 on the container
# - "3306"
# # Where our data will be persisted
# volumes:
# - ./volumes/db/mysql:/var/lib/mysql
postgres: postgres:
container_name: cs-repro-postgres container_name: cs-repro-postgres
environment: environment:
@@ -27,6 +52,7 @@ services:
timeout: 3s timeout: 3s
retries: 3 retries: 3
openldap: openldap:
platform: linux/amd64
container_name: cs-repro-openldap container_name: cs-repro-openldap
hostname: openldap hostname: openldap
restart: unless-stopped restart: unless-stopped
@@ -63,7 +89,7 @@ services:
depends_on: depends_on:
postgres: postgres:
condition: service_healthy condition: service_healthy
image: mattermost/mattermost-enterprise-edition:release-7.8 image: mattermost/mattermost-enterprise-edition:release-7.9
restart: unless-stopped restart: unless-stopped
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
@@ -83,10 +109,13 @@ services:
- ./volumes/mattermost/bleve-indexes:/mattermost/bleve-indexes:rw - ./volumes/mattermost/bleve-indexes:/mattermost/bleve-indexes:rw
- ./license.mattermost:/mattermost/config/license.mattermost-enterprise:ro - ./license.mattermost:/mattermost/config/license.mattermost-enterprise:ro
- ./files/mattermost/samlCert.crt:/mattermost/config/samlCert.crt - ./files/mattermost/samlCert.crt:/mattermost/config/samlCert.crt
- ./files/mattermost/defaultConfig.json:/mattermost/config/defaultConfig.json - ./files/mattermost/advancedLogging.json:/mattermost/config/advancedLogging.json:ro
- ./files/mattermost/defaultConfig.json:/mattermost/config/defaultConfig.json:ro
environment: environment:
- MM_SqlSettings_DriverName=postgres - MM_SqlSettings_DriverName=postgres
- MM_SqlSettings_DataSource=postgres://mmuser:mmuser_password@cs-repro-postgres:5432/mattermost?sslmode=disable&connect_timeout=10&binary_parameters=yes - MM_SqlSettings_DataSource=postgres://mmuser:mmuser_password@cs-repro-postgres:5432/mattermost?sslmode=disable&connect_timeout=10&binary_parameters=yes
# - MM_SqlSettings_DriverName=mysql
# - MM_SqlSettings_DataSource=mmuser:mmuser_password@tcp(mysql:3306)/mattermost?charset=utf8mb4,utf8&writeTimeout=30s
- MM_ServiceSettings_EnableLocalMode=true - MM_ServiceSettings_EnableLocalMode=true
- MM_ServiceSettings_LocalModeSocketLocation=/var/tmp/mattermost_local.socket - MM_ServiceSettings_LocalModeSocketLocation=/var/tmp/mattermost_local.socket
- MM_ServiceSettings_LicenseFileLocation=/mattermost/config/license.mattermost-enterprise - MM_ServiceSettings_LicenseFileLocation=/mattermost/config/license.mattermost-enterprise

View File

@@ -30,7 +30,7 @@
], ],
"Options": { "Options": {
"Compress": true, "Compress": true,
"Filename": "traceLogs.json", "Filename": "./logs/traceLogs.json",
"MaxAgeDays": 15, "MaxAgeDays": 15,
"MaxBackups": 3, "MaxBackups": 3,
"MaxSizeMB": 100 "MaxSizeMB": 100

View File

@@ -15,7 +15,7 @@
"EnableWebhookDebugging": true, "EnableWebhookDebugging": true,
"EnableDiagnostics": true, "EnableDiagnostics": true,
"EnableSentry": true, "EnableSentry": true,
"AdvancedLoggingConfig": "" "AdvancedLoggingConfig": "./advancedLogging.json"
}, },
"ExperimentalAuditSettings": { "ExperimentalAuditSettings": {
"FileEnabled": false, "FileEnabled": false,
@@ -25,7 +25,7 @@
"FileMaxBackups": 0, "FileMaxBackups": 0,
"FileCompress": false, "FileCompress": false,
"FileMaxQueueSize": 1000, "FileMaxQueueSize": 1000,
"AdvancedLoggingConfig": "" "AdvancedLoggingConfig": "./advancedLogging.json"
}, },
"NotificationLogSettings": { "NotificationLogSettings": {
"EnableConsole": true, "EnableConsole": true,
@@ -36,7 +36,7 @@
"FileLevel": "INFO", "FileLevel": "INFO",
"FileJson": true, "FileJson": true,
"FileLocation": "", "FileLocation": "",
"AdvancedLoggingConfig": "" "AdvancedLoggingConfig": "./advancedLogging.json"
}, },
"LdapSettings": { "LdapSettings": {
"Enable": true, "Enable": true,