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

plus de smtp par défaut pour les orgas

Browse Source
This commit is contained in:
Fanch
2026-06-06 16:16:28 +02:00
parent 71b81358d8
commit af77b82c57
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/orgaTmpl/docker-compose.yml
+7 -20
View File
@@ -14,7 +14,7 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
environment: environment:
- MARIADB_AUTO_UPGRADE=1 - MARIADB_AUTO_UPGRADE=1
env_file: env_file:
- ../../secret/orgas/${orga}/env-${nextcloudDBName} - ../../secret/orgas/${orga}/env-${nextcloudDBName}
# - ../../secret/orgas/${orga}/env-${mattermostDBName} # - ../../secret/orgas/${orga}/env-${mattermostDBName}
@@ -25,7 +25,7 @@ services:
#maridb10.5 #maridb10.5
#test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p$$MYSQL_ROOT_PASSWORD' ] #test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p$$MYSQL_ROOT_PASSWORD' ]
#maridb11.4 #maridb11.4
#test: ["CMD", 'healthcheck.sh', '--su-mysql', '--connect', '--innodb_initialized'] #test: ["CMD", 'healthcheck.sh', '--su-mysql', '--connect', '--innodb_initialized']
test: ["CMD", "mariadb-admin", "ping", "--silent"] test: ["CMD", "mariadb-admin", "ping", "--silent"]
interval: 30s interval: 30s
timeout: 30s timeout: 30s
@@ -46,8 +46,6 @@ services:
# condition: service_healthy # on peut mais ca va ralentir le process # condition: service_healthy # on peut mais ca va ralentir le process
links: links:
- db - db
external_links:
- ${smtpServName}:${smtpHost}
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.${orga}-${nextcloudServName}.rule=Host(`${orga}-${cloudHost}.${domain}`){{FOREIGN_NC}}" - "traefik.http.routers.${orga}-${nextcloudServName}.rule=Host(`${orga}-${cloudHost}.${domain}`){{FOREIGN_NC}}"
@@ -67,8 +65,6 @@ services:
- ../../secret/orgas/${orga}/env-${nextcloudDBName} - ../../secret/orgas/${orga}/env-${nextcloudDBName}
environment: environment:
- NEXTCLOUD_TRUSTED_DOMAINS=${orga}-${cloudHost}.${domain} - NEXTCLOUD_TRUSTED_DOMAINS=${orga}-${cloudHost}.${domain}
- SMTP_HOST=${smtpHost}
- SMTP_PORT=25
- MAIL_DOMAIN=${domain} - MAIL_DOMAIN=${domain}
#}} #}}
#{{agora #{{agora
@@ -87,7 +83,7 @@ services:
networks: networks:
- orgaNet - orgaNet
# - postfixNet # - postfixNet
expose: expose:
- ${matterPort} - ${matterPort}
depends_on: depends_on:
- db - db
@@ -95,8 +91,6 @@ services:
# condition: service_healthy # on peut mais ca va ralentir le process # condition: service_healthy # on peut mais ca va ralentir le process
links: links:
- db - db
external_links:
- ${smtpServName}:${smtpHost}.${domain}
volumes: volumes:
- matterConfig:/mattermost/config:rw - matterConfig:/mattermost/config:rw
- matterData:/mattermost/data:rw - matterData:/mattermost/data:rw
@@ -133,13 +127,11 @@ services:
# condition: service_healthy # on peut mais ca va ralentir le process # condition: service_healthy # on peut mais ca va ralentir le process
links: links:
- db - db
external_links:
- ${smtpServName}:${smtpHost}.${domain}
env_file: env_file:
- ../../secret/orgas/${orga}/env-${wordpressServName} - ../../secret/orgas/${orga}/env-${wordpressServName}
environment: environment:
- WORDPRESS_SMTP_HOST=${smtpHost}.${domain} # - WORDPRESS_SMTP_HOST=${smtpHost}.${domain}
- WORDPRESS_SMTP_PORT=25 # - WORDPRESS_SMTP_PORT=25
# - WORDPRESS_SMTP_USERNAME # - WORDPRESS_SMTP_USERNAME
# - WORDPRESS_SMTP_PASSWORD # - WORDPRESS_SMTP_PASSWORD
# - WORDPRESS_SMTP_FROM=${orga}- # - WORDPRESS_SMTP_FROM=${orga}-
@@ -169,9 +161,6 @@ services:
- wikiLogs:/var/log - wikiLogs:/var/log
networks: networks:
- orgaNet - orgaNet
# - postfixNet
external_links:
- ${smtpServName}:${smtpHost}.${domain}
#}} #}}
#{{castopod #{{castopod
castopod: castopod:
@@ -183,14 +172,12 @@ services:
networks: networks:
- orgaNet - orgaNet
# - postfixNet # - postfixNet
expose: expose:
- 8000 - 8000
depends_on: depends_on:
- db - db
links: links:
- db - db
external_links:
- ${smtpServName}:${smtpHost}.${domain}
volumes: volumes:
- castopodMedia:/var/www/castopod/public/media - castopodMedia:/var/www/castopod/public/media
environment: environment:
@@ -215,7 +202,7 @@ services:
- orgaNet - orgaNet
env_file: env_file:
- ../../secret/orgas/${orga}/env-${castopodServName} - ../../secret/orgas/${orga}/env-${castopodServName}
command: --requirepass ${castopodRedisPassword} command: --requirepass ${castopodRedisPassword}
#}} #}}
#{{spip #{{spip
spip: spip:
config/orgaTmpl/wiki-conf/local.php
-2
View File
@@ -14,13 +14,11 @@ $conf['superuser'] = '@admin';
$conf['manager'] = '@manager'; $conf['manager'] = '@manager';
$conf['disableactions'] = 'register'; $conf['disableactions'] = 'register';
$conf['remoteuser'] = ''; $conf['remoteuser'] = '';
$conf['mailfrom'] = 'dokuwiki@kaz.bzh';
$conf['updatecheck'] = 0; $conf['updatecheck'] = 0;
$conf['userewrite'] = '1'; $conf['userewrite'] = '1';
$conf['useslash'] = 1; $conf['useslash'] = 1;
$conf['plugin']['ckgedit']['scayt_auto'] = 'on'; $conf['plugin']['ckgedit']['scayt_auto'] = 'on';
$conf['plugin']['ckgedit']['scayt_lang'] = 'French/fr_FR'; $conf['plugin']['ckgedit']['scayt_lang'] = 'French/fr_FR';
$conf['plugin']['ckgedit']['other_lang'] = 'fr'; $conf['plugin']['ckgedit']['other_lang'] = 'fr';
$conf['plugin']['smtp']['smtp_host'] = 'smtp.kaz.bzh';
$conf['plugin']['todo']['CheckboxText'] = 0; $conf['plugin']['todo']['CheckboxText'] = 0;
$conf['plugin']['wrap']['restrictionType'] = '1'; $conf['plugin']['wrap']['restrictionType'] = '1';