From e140f722e75fd39a14b281cac36b5c2efa98f648 Mon Sep 17 00:00:00 2001 From: root <1510183@gmail.com> Date: Fri, 7 Aug 2020 20:41:54 +0000 Subject: [PATCH] configure output of system parameters --- README.md | 12 ++++++++++-- docker-compose.yml | 2 +- ireddocker/docker-entrypoint.sh | 4 +++- ireddocker/iredmail/functions/cleanup.sh | 8 ++++---- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b56b776..106bf92 100644 --- a/README.md +++ b/README.md @@ -80,10 +80,10 @@ MYSQL_ROOT_PASSWORD= EOF ``` -1. Create directory for mail and for certificates (default is ```mail_dir``` and ```cert_dir``` ```conf-dir``` . For other location this filder need to be change in ```docker-compose.yml``` file ) +1. Create directory for mail and for certificates (default is ```mail_dir```, ```cert_dir``` and ```conf_dir``` . For other location this filder need to be change in ```docker-compose.yml``` file ) ``` -mkdir conf-dir +mkdir conf_dir mkdir mail_dir mkdir cert_dir ``` @@ -92,3 +92,11 @@ mkdir cert_dir ## RUN ```docker-compose up -d``` + +## USAGE + +At the first boot system spend mutch time to initialize, configure required components, load required files. When initialization is finished, you can see two file in conf_dir: +1. config - file with all used passwords and configs in system + +1. access - file, with admin account - postmaster@ + diff --git a/docker-compose.yml b/docker-compose.yml index 8065247..c66fe3a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,7 +39,7 @@ services: volumes: - ./cert_dir:/opt/iredmail/ssl - ./mail_dir:/var/vmail/vmail1 - - ./conf-dir:/var/config + - ./conf_dir:/var/config depends_on: - master_mariadb diff --git a/ireddocker/docker-entrypoint.sh b/ireddocker/docker-entrypoint.sh index 4bea65f..b6d9ebb 100644 --- a/ireddocker/docker-entrypoint.sh +++ b/ireddocker/docker-entrypoint.sh @@ -119,19 +119,21 @@ useradd -U --home-dir /home/syslog --groups adm -s /usr/sbin/nologin syslog MYSQL_SERVER_PORT=$MYSQL_SERVER_PORT MYSQL_ROOT_USER=$MYSQL_ROOT_USER \ MYSQL_ROOT_PASSWD=$MYSQL_ROOT_PASSWD MYSQL_GRANT_HOST=$MYSQL_GRANT_HOST \ AUTO_USE_EXISTING_CONFIG_FILE=y AUTO_INSTALL_WITHOUT_CONFIRM=y \ + AUTO_CLEANUP_REPLACE_FIREWALL_RULES=n AUTO_CLEANUP_RESTART_FIREWALL=y\ AUTO_CLEANUP_REMOVE_SENDMAIL=y AUTO_CLEANUP_REPLACE_MYSQL_CONFIG=y \ bash /iredmail/iRedMail.sh echo $MYSQL_SERVER_ADDRESS echo $MYSQL_GRANT_HOST else AUTO_USE_EXISTING_CONFIG_FILE=y AUTO_INSTALL_WITHOUT_CONFIRM=y \ + AUTO_CLEANUP_REPLACE_FIREWALL_RULES=n AUTO_CLEANUP_RESTART_FIREWALL=y \ AUTO_CLEANUP_REMOVE_SENDMAIL=y AUTO_CLEANUP_REPLACE_MYSQL_CONFIG=y \ bash /iredmail/iRedMail.sh fi cp /opt/www/iredadmin/rc_scripts/uwsgi/debian.ini /etc/uwsgi/apps-enabled/iredadmin.ini cp /opt/mlmmjadmin/rc_scripts/uwsgi/debian.ini /etc/uwsgi/apps-enabled/mlmmjadmin.ini - + cp /iredmail/config /var/config/config external_ldap_config() { diff --git a/ireddocker/iredmail/functions/cleanup.sh b/ireddocker/iredmail/functions/cleanup.sh index 1592df0..7450768 100644 --- a/ireddocker/iredmail/functions/cleanup.sh +++ b/ireddocker/iredmail/functions/cleanup.sh @@ -354,23 +354,23 @@ EOF EOF if [ X"${USE_ROUNDCUBE}" == X'YES' ]; then - cat <> /var/config/access * - Roundcube webmail: https://${HOSTNAME}/mail/ EOF fi if [ X"${USE_SOGO}" == X'YES' ]; then - cat <> /var/config/access * - SOGo groupware: https://${HOSTNAME}/SOGo/ EOF fi if [ X"${USE_NETDATA}" == X'YES' ]; then - cat <> /var/config/access * - netdata (monitor): https://${HOSTNAME}/netdata/ EOF fi - cat <> /var/config/access * * - Web admin panel (iRedAdmin): https://${HOSTNAME}/iredadmin/ *