KAZ/KazV2
11
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into feat/python

Browse Source
This commit is contained in:
Fanch
2025-07-26 15:45:22 +02:00
parent 9f0b8f2e1e 813e0e761f
commit 6e58f328e4
6 changed files with 20 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/updateDockerPassword.sh
View File

@@ -84,7 +84,6 @@ jirafeauUpdate(){
updateEnvDB "etherpad" "${KAZ_KEY_DIR}/env-${etherpadDBName}" "${etherpadDBName}" updateEnvDB "etherpad" "${KAZ_KEY_DIR}/env-${etherpadDBName}" "${etherpadDBName}"
updateEnvDB "framadate" "${KAZ_KEY_DIR}/env-${framadateDBName}" "${framadateDBName}" updateEnvDB "framadate" "${KAZ_KEY_DIR}/env-${framadateDBName}" "${framadateDBName}"
updateEnvDB "gitea" "${KAZ_KEY_DIR}/env-${gitDBName}" "${gitDBName}" updateEnvDB "gitea" "${KAZ_KEY_DIR}/env-${gitDBName}" "${gitDBName}"
updateEnvDB "mattermost" "${KAZ_KEY_DIR}/env-${mattermostDBName}" "${mattermostDBName}"
updateEnvDB "nextcloud" "${KAZ_KEY_DIR}/env-${nextcloudDBName}" "${nextcloudDBName}" updateEnvDB "nextcloud" "${KAZ_KEY_DIR}/env-${nextcloudDBName}" "${nextcloudDBName}"
updateEnvDB "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeDBName}" "${roundcubeDBName}" updateEnvDB "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeDBName}" "${roundcubeDBName}"
updateEnvDB "sympa" "${KAZ_KEY_DIR}/env-${sympaDBName}" "${sympaDBName}" updateEnvDB "sympa" "${KAZ_KEY_DIR}/env-${sympaDBName}" "${sympaDBName}"
@@ -103,6 +102,7 @@ updateEnv "gandi" "${KAZ_KEY_DIR}/env-gandi"
updateEnv "gitea" "${KAZ_KEY_DIR}/env-${gitServName}" updateEnv "gitea" "${KAZ_KEY_DIR}/env-${gitServName}"
updateEnv "jirafeau" "${KAZ_KEY_DIR}/env-${jirafeauServName}" updateEnv "jirafeau" "${KAZ_KEY_DIR}/env-${jirafeauServName}"
updateEnv "mattermost" "${KAZ_KEY_DIR}/env-${mattermostServName}" updateEnv "mattermost" "${KAZ_KEY_DIR}/env-${mattermostServName}"
updateEnv "mattermost" "${KAZ_KEY_DIR}/env-${mattermostDBName}"
updateEnv "nextcloud" "${KAZ_KEY_DIR}/env-${nextcloudServName}" updateEnv "nextcloud" "${KAZ_KEY_DIR}/env-${nextcloudServName}"
updateEnv "office" "${KAZ_KEY_DIR}/env-${officeServName}" updateEnv "office" "${KAZ_KEY_DIR}/env-${officeServName}"
updateEnv "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeServName}" updateEnv "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeServName}"

2
config/dockers.tmpl.env
View File

@@ -101,7 +101,7 @@ snappymailHost=snappymail
######################################## ########################################
# ports internes # ports internes
matterPort=8000 matterPort=8065
imapsyncPort=8080 imapsyncPort=8080
apikaz=5000 apikaz=5000

4
dockers/mattermost/first.sh
View File

@@ -11,3 +11,7 @@ cd $(dirname $0)
"${KAZ_BIN_DIR}/gestContainers.sh" --install -M -agora "${KAZ_BIN_DIR}/gestContainers.sh" --install -M -agora
docker exec ${mattermostServName} mmctl auth login https://${matterHost}.${domain} --name local-server --username ${mattermost_MM_ADMIN_USER} --password ${mattermost_MM_ADMIN_PASSWORD}
docker exec ${mattermostServName} mmctl channel create --team kaz --name "une-question--un-soucis" --display-name "Une question ? Un souci ?"
docker exec ${mattermostServName} mmctl channel create --team kaz --name "cafe-du-commerce--ouvert-2424h" --display-name "Café du commerce"
docker exec ${mattermostServName} mmctl channel create --team kaz --name "creation-comptes" --display-name "Création comptes"

30
secret.tmpl/SetAllPass.sh
View File

@@ -48,30 +48,18 @@ gandi_dns_gandi_api_key="${gandi_GANDI_KEY}"
#################### ####################
# mattermost # mattermost
mattermost_MYSQL_ROOT_PASSWORD="--clean_val--" mattermost_POSTGRES_USER="mattermost"
mattermost_MYSQL_DATABASE="--clean_val--" mattermost_POSTGRES_PASSWORD="--clean_val--"
mattermost_MYSQL_USER="--clean_val--" mattermost_POSTGRES_DB="mattermost"
mattermost_MYSQL_PASSWORD="--clean_val--"
# Share with mattermostDB mattermost_MM_ADMIN_EMAIL="${matterHost}@${domain}"
mattermost_MM_DBNAME="${mattermost_MYSQL_DATABASE}" mattermost_MM_ADMIN_USER="admin-mattermost"
mattermost_MM_USERNAME="${mattermost_MYSQL_USER}" mattermost_MM_ADMIN_PASSWORD="--clean_val--@"
mattermost_MM_PASSWORD="${mattermost_MYSQL_PASSWORD}" mattermost_MM_SQLSETTINGS_DATASOURCE="postgres://${mattermost_POSTGRES_USER}:${mattermost_POSTGRES_PASSWORD}@postgres:5432/${mattermost_POSTGRES_DB}?sslmode=disable&connect_timeout=10"
mattermost_DB_PORT_NUMBER="3306"
mattermost_DB_HOST="db"
mattermost_MM_SQLSETTINGS_DRIVERNAME="mysql"
mattermost_MM_ADMIN_EMAIL="admin@kaz.bzh"
# mattermost_MM_SQLSETTINGS_DATASOURCE = "MM_USERNAME:MM_PASSWORD@tcp(DB_HOST:DB_PORT_NUMBER)/MM_DBNAME?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
# Don't forget to replace all entries (beginning by MM_ and DB_) in MM_SQLSETTINGS_DATASOURCE with the real variables values.
mattermost_MM_SQLSETTINGS_DATASOURCE="${mattermost_MYSQL_USER}:${mattermost_MYSQL_PASSWORD}@tcp(${mattermost_DB_HOST}:${mattermost_DB_PORT_NUMBER})/${mattermost_MM_DBNAME}?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
# sinon avec postgres
# mattermost_MM_SQLSETTINGS_DATASOURCE = "postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10"
# pour envoyer des messages sur l'agora avec mmctl # pour envoyer des messages sur l'agora avec mmctl
mattermost_user="admin-mattermost" mattermost_user="${mattermost_MM_ADMIN_USER}"
mattermost_pass="--clean_val--" mattermost_pass="${mattermost_MM_ADMIN_PASSWORD}"
mattermost_token="xxx-private" mattermost_token="xxx-private"
################## ##################

11
secret.tmpl/env-mattermostDB
View File

@@ -1,8 +1,3 @@
POSTGRES_USER=
MYSQL_ROOT_PASSWORD= POSTGRES_PASSWORD=
MYSQL_DATABASE= POSTGRES_DB=
MYSQL_USER=
MYSQL_PASSWORD=
MM_MYSQL_USER=
MM_MYSQL_PASSWORD=

13
secret.tmpl/env-mattermostServ
View File

@@ -1,15 +1,4 @@
MM_SQLSETTINGS_DATASOURCE=
# share with matterDB
MM_DBNAME=
MM_USERNAME=
MM_PASSWORD=
MM_ADMIN_EMAIL= MM_ADMIN_EMAIL=
MM_ADMIN_USER= MM_ADMIN_USER=
MM_ADMIN_PASSWORD= MM_ADMIN_PASSWORD=
DB_HOST=
DB_PORT_NUMBER=
MM_SQLSETTINGS_DRIVERNAME=
MM_SQLSETTINGS_DATASOURCE=