From 659306c351677a900c34d46145695bdcf8cf3896 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Sun, 27 Sep 2020 17:54:35 -0400 Subject: [PATCH] mattermost_net --- extra/mattermost.yml | 16 ++++++++++++++++ scripts/subinstallers/gen_prod_env.sh | 2 ++ 2 files changed, 18 insertions(+) diff --git a/extra/mattermost.yml b/extra/mattermost.yml index 6a54c2c..b3295c8 100644 --- a/extra/mattermost.yml +++ b/extra/mattermost.yml @@ -13,6 +13,9 @@ services: - /etc/localtime:/etc/localtime:ro env_file: - ../.envs/.production/.mattermost + networks: + mattermost_net: + ipv4_address: 10.2.0.3 #environment: # - POSTGRES_USER=mmuser # - POSTGRES_PASSWORD=mmuser_password @@ -45,6 +48,9 @@ services: # - /pki_chain.pem:/etc/ssl/certs/pki_chain.pem:ro env_file: - ../.envs/.production/.mattermost + networks: + mattermost_net: + ipv4_address: 10.2.0.2 #environment: # # set same as db credentials and dbname # #- MM_USERNAME=mmuser @@ -82,8 +88,18 @@ services: # This directory must have cert files if you want to enable SSL #- ./volumes/web/cert:/cert:ro - /etc/localtime:/etc/localtime:ro + networks: + default: + mattermost_net: + ipv4_address: 10.2.0.1 networks: default: external: name: mistborn_default + + mattermost_net: + driver: bridge + ipam: + config: + - subnet: 10.2.0.0/29 diff --git a/scripts/subinstallers/gen_prod_env.sh b/scripts/subinstallers/gen_prod_env.sh index ead670d..3dcdee4 100755 --- a/scripts/subinstallers/gen_prod_env.sh +++ b/scripts/subinstallers/gen_prod_env.sh @@ -85,3 +85,5 @@ echo "MM_USERNAME=mmuser" > $MATTERMOST_PROD_FILE echo "MM_PASSWORD=$1" >> $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)]))") +echo "POSTGRES_PASSWORD=$POSTGRES_PASSWORD" >> $MATTERMOST_PROD_FILE