update env files location

This commit is contained in:
root
2020-08-07 15:21:28 +00:00
parent 3b200ff06f
commit f36c781c69
3 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
/ireddocker/main.cvd /envfiles/mariadb-env.conf
/ireddocker/iredmail-env.conf /envfiles/iredmail-env.conf
/cert_dir/* /cert_dir/*
/mail_dir/* /mail_dir/*
+3 -3
View File
@@ -9,8 +9,8 @@ services:
master_mariadb: master_mariadb:
image: mariadb:10.5.4-focal image: mariadb:10.5.4-focal
container_name: master_mariadb container_name: master_mariadb
environment: env_file:
MYSQL_ROOT_PASSWORD: "123qweASD" - envfiles/mariadb-env.conf
ports: ports:
- "3306:3306" - "3306:3306"
volumes: volumes:
@@ -25,7 +25,7 @@ services:
container_name: iredmail container_name: iredmail
hostname: mail.resds.ru hostname: mail.resds.ru
env_file: env_file:
- ireddocker/iredmail-env.conf - envfiles/iredmail-env.conf
ports: ports:
- "110:110" - "110:110"
- "995:995" - "995:995"
+3 -3
View File
@@ -420,8 +420,8 @@ sed -i 's/ENABLED=0/ENABLED=1/g' /etc/default/spamassassin
if [[ X"${LDAP_EXTERNAL_USE}" != X'YES' || X"${LDAP_EXTERNAL_USE}" != X'yes' ]]; then if [[ X"${LDAP_EXTERNAL_USE}" != X'YES' || X"${LDAP_EXTERNAL_USE}" != X'yes' ]]; then
service slapd restart service slapd restart
service iredapd restart /usr/bin/python3 /opt/iredapd/iredapd.py &
fi fi
while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do
sleep 5 sleep 5
@@ -471,7 +471,7 @@ else
if [[ X"${LDAP_EXTERNAL_USE}" != X'YES' || X"${LDAP_EXTERNAL_USE}" != X'yes' ]]; then if [[ X"${LDAP_EXTERNAL_USE}" != X'YES' || X"${LDAP_EXTERNAL_USE}" != X'yes' ]]; then
service slapd start service slapd start
service iredapd start /usr/bin/python3 /opt/iredapd/iredapd.py &
fi fi
while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do