crappyrules/mistborn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

env file

Browse Source
This commit is contained in:
Steven Foerster
2020-09-28 08:27:56 -04:00
parent 9fc5f044dd
commit 61038ce230
3 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extra/mattermost.yml
+2 -21
View File
@@ -11,11 +11,6 @@ services:
volumes: volumes:
- ../../mistborn_volumes/extra/mattermost/db/var/lib/postgresql/data:/var/lib/postgresql/data - ../../mistborn_volumes/extra/mattermost/db/var/lib/postgresql/data:/var/lib/postgresql/data
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
env_file:
- ../.envs/.production/.mattermost
networks:
mattermost_net:
ipv4_address: 10.2.5.4
#environment: #environment:
# - POSTGRES_USER=mmuser # - POSTGRES_USER=mmuser
# - POSTGRES_PASSWORD=mmuser_password # - POSTGRES_PASSWORD=mmuser_password
@@ -46,12 +41,7 @@ services:
# When you want to use SSO with GitLab, you have to add the cert pki chain of GitLab inside Alpine # When you want to use SSO with GitLab, you have to add the cert pki chain of GitLab inside Alpine
# to avoid Token request failed: certificate signed by unknown authority (link: https://github.com/mattermost/mattermost-server/issues/13059) # to avoid Token request failed: certificate signed by unknown authority (link: https://github.com/mattermost/mattermost-server/issues/13059)
# - <path_to_your_gitlab_pki>/pki_chain.pem:/etc/ssl/certs/pki_chain.pem:ro # - <path_to_your_gitlab_pki>/pki_chain.pem:/etc/ssl/certs/pki_chain.pem:ro
env_file: environment:
- ../.envs/.production/.mattermost
networks:
mattermost_net:
ipv4_address: 10.2.5.3
#environment:
# # set same as db credentials and dbname # # set same as db credentials and dbname
# #- MM_USERNAME=mmuser # #- MM_USERNAME=mmuser
# #- MM_PASSWORD=mmuser_password # #- MM_PASSWORD=mmuser_password
@@ -60,7 +50,7 @@ services:
# # use the credentials you've set above, in the format: # # use the credentials you've set above, in the format:
# # MM_SQLSETTINGS_DATASOURCE=postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10 # # MM_SQLSETTINGS_DATASOURCE=postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10
# #- MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mmuser_password@db:5432/mattermost?sslmode=disable&connect_timeout=10 # #- MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mmuser_password@db:5432/mattermost?sslmode=disable&connect_timeout=10
# - MM_SQLSETTINGS_DATASOURCE=postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10 - MM_SQLSETTINGS_DATASOURCE=postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10
# # in case your config is not in default location # # in case your config is not in default location
# #- MM_CONFIG=/mattermost/config/config.json # #- MM_CONFIG=/mattermost/config/config.json
@@ -88,18 +78,9 @@ services:
# This directory must have cert files if you want to enable SSL # This directory must have cert files if you want to enable SSL
#- ./volumes/web/cert:/cert:ro #- ./volumes/web/cert:/cert:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
networks:
default:
mattermost_net:
ipv4_address: 10.2.5.2
networks: networks:
default: default:
external: external:
name: mistborn_default name: mistborn_default
mattermost_net:
driver: bridge
ipam:
config:
- subnet: 10.2.5.0/29
scripts/services/Mistborn-mattermost.service
+1 -1
View File
@@ -12,7 +12,7 @@ PermissionsStartOnly=true
ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/mattermost.yml down ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/mattermost.yml down
# Start container when unit is started # Start container when unit is started
ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/mattermost.yml up --build ExecStart=/usr/local/bin/docker-compose --env-file /opt/mistborn/.envs/.production/.mattermost -f /opt/mistborn/extra/mattermost.yml up --build
# Stop container when unit is stopped # Stop container when unit is stopped
ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/mattermost.yml down ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/mattermost.yml down
# Post stop # Post stop
scripts/subinstallers/gen_prod_env.sh
-1
View File
@@ -84,6 +84,5 @@ MATTERMOST_PROD_FILE="./.envs/.production/.mattermost"
echo "MM_USERNAME=mmuser" > $MATTERMOST_PROD_FILE echo "MM_USERNAME=mmuser" > $MATTERMOST_PROD_FILE
echo "MM_PASSWORD=$1" >> $MATTERMOST_PROD_FILE echo "MM_PASSWORD=$1" >> $MATTERMOST_PROD_FILE
echo "MM_DBNAME=mattermost" >> $MATTERMOST_PROD_FILE echo "MM_DBNAME=mattermost" >> $MATTERMOST_PROD_FILE
echo "MM_SQLSETTINGS_DATASOURCE=postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10" >> $MATTERMOST_PROD_FILE
POSTGRES_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))") POSTGRES_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")
echo "POSTGRES_PASSWORD=$POSTGRES_PASSWORD" >> $MATTERMOST_PROD_FILE echo "POSTGRES_PASSWORD=$POSTGRES_PASSWORD" >> $MATTERMOST_PROD_FILE