plus de smtp par défaut pour les orgas
This commit is contained in:
@@ -14,7 +14,7 @@ services:
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
- /etc/timezone:/etc/timezone:ro
|
||||
environment:
|
||||
- MARIADB_AUTO_UPGRADE=1
|
||||
- MARIADB_AUTO_UPGRADE=1
|
||||
env_file:
|
||||
- ../../secret/orgas/${orga}/env-${nextcloudDBName}
|
||||
# - ../../secret/orgas/${orga}/env-${mattermostDBName}
|
||||
@@ -25,7 +25,7 @@ services:
|
||||
#maridb10.5
|
||||
#test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p$$MYSQL_ROOT_PASSWORD' ]
|
||||
#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"]
|
||||
interval: 30s
|
||||
timeout: 30s
|
||||
@@ -46,8 +46,6 @@ services:
|
||||
# condition: service_healthy # on peut mais ca va ralentir le process
|
||||
links:
|
||||
- db
|
||||
external_links:
|
||||
- ${smtpServName}:${smtpHost}
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.${orga}-${nextcloudServName}.rule=Host(`${orga}-${cloudHost}.${domain}`){{FOREIGN_NC}}"
|
||||
@@ -67,8 +65,6 @@ services:
|
||||
- ../../secret/orgas/${orga}/env-${nextcloudDBName}
|
||||
environment:
|
||||
- NEXTCLOUD_TRUSTED_DOMAINS=${orga}-${cloudHost}.${domain}
|
||||
- SMTP_HOST=${smtpHost}
|
||||
- SMTP_PORT=25
|
||||
- MAIL_DOMAIN=${domain}
|
||||
#}}
|
||||
#{{agora
|
||||
@@ -87,7 +83,7 @@ services:
|
||||
networks:
|
||||
- orgaNet
|
||||
# - postfixNet
|
||||
expose:
|
||||
expose:
|
||||
- ${matterPort}
|
||||
depends_on:
|
||||
- db
|
||||
@@ -95,8 +91,6 @@ services:
|
||||
# condition: service_healthy # on peut mais ca va ralentir le process
|
||||
links:
|
||||
- db
|
||||
external_links:
|
||||
- ${smtpServName}:${smtpHost}.${domain}
|
||||
volumes:
|
||||
- matterConfig:/mattermost/config:rw
|
||||
- matterData:/mattermost/data:rw
|
||||
@@ -133,13 +127,11 @@ services:
|
||||
# condition: service_healthy # on peut mais ca va ralentir le process
|
||||
links:
|
||||
- db
|
||||
external_links:
|
||||
- ${smtpServName}:${smtpHost}.${domain}
|
||||
env_file:
|
||||
- ../../secret/orgas/${orga}/env-${wordpressServName}
|
||||
environment:
|
||||
- WORDPRESS_SMTP_HOST=${smtpHost}.${domain}
|
||||
- WORDPRESS_SMTP_PORT=25
|
||||
# - WORDPRESS_SMTP_HOST=${smtpHost}.${domain}
|
||||
# - WORDPRESS_SMTP_PORT=25
|
||||
# - WORDPRESS_SMTP_USERNAME
|
||||
# - WORDPRESS_SMTP_PASSWORD
|
||||
# - WORDPRESS_SMTP_FROM=${orga}-
|
||||
@@ -169,9 +161,6 @@ services:
|
||||
- wikiLogs:/var/log
|
||||
networks:
|
||||
- orgaNet
|
||||
# - postfixNet
|
||||
external_links:
|
||||
- ${smtpServName}:${smtpHost}.${domain}
|
||||
#}}
|
||||
#{{castopod
|
||||
castopod:
|
||||
@@ -183,14 +172,12 @@ services:
|
||||
networks:
|
||||
- orgaNet
|
||||
# - postfixNet
|
||||
expose:
|
||||
expose:
|
||||
- 8000
|
||||
depends_on:
|
||||
- db
|
||||
links:
|
||||
- db
|
||||
external_links:
|
||||
- ${smtpServName}:${smtpHost}.${domain}
|
||||
volumes:
|
||||
- castopodMedia:/var/www/castopod/public/media
|
||||
environment:
|
||||
@@ -215,7 +202,7 @@ services:
|
||||
- orgaNet
|
||||
env_file:
|
||||
- ../../secret/orgas/${orga}/env-${castopodServName}
|
||||
command: --requirepass ${castopodRedisPassword}
|
||||
command: --requirepass ${castopodRedisPassword}
|
||||
#}}
|
||||
#{{spip
|
||||
spip:
|
||||
|
||||
@@ -14,13 +14,11 @@ $conf['superuser'] = '@admin';
|
||||
$conf['manager'] = '@manager';
|
||||
$conf['disableactions'] = 'register';
|
||||
$conf['remoteuser'] = '';
|
||||
$conf['mailfrom'] = 'dokuwiki@kaz.bzh';
|
||||
$conf['updatecheck'] = 0;
|
||||
$conf['userewrite'] = '1';
|
||||
$conf['useslash'] = 1;
|
||||
$conf['plugin']['ckgedit']['scayt_auto'] = 'on';
|
||||
$conf['plugin']['ckgedit']['scayt_lang'] = 'French/fr_FR';
|
||||
$conf['plugin']['ckgedit']['other_lang'] = 'fr';
|
||||
$conf['plugin']['smtp']['smtp_host'] = 'smtp.kaz.bzh';
|
||||
$conf['plugin']['todo']['CheckboxText'] = 0;
|
||||
$conf['plugin']['wrap']['restrictionType'] = '1';
|
||||
|
||||
Reference in New Issue
Block a user