diff --git a/.gitignore b/.gitignore index 8e9fd74..9ca0081 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -main.cvd -iredmail-env.conf +/ireddocker/main.cvd +/ireddocker/iredmail-env.conf diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..175aee3 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,48 @@ +version: '3' + +# TODO +# - add `depends_on:` +# - add top-level `volumes:` + +volumes: + mariadb: + mail_dir: + cert_dir: + +services: + master_mariadb: + image: mariadb:latest + container_name: master_mariadb + environment: + MYSQL_ROOT_PASSWORD: "123qweASD" + ports: + - "3306:3306" + volumes: + - mariadb:/etc/mysql/conf.d/ + + + ireddocker: + build: + dockerfile: ireddocker/Dockerfile + context: ireddocker/ + image: ireddocker:0.1 + container_name: iredmail-mail + hostname: mail.recsds.spbsut.ru + env_file: + - ireddocker/iredmail-env.conf + ports: + - "110:110" + - "995:995" + - "143:143" + - "993:993" + - "443:443" + - "80:80" + - "25:25" + - "587:587" + - "465:465" + volumes: + - cert_dir:/opt/iredmail/ssl + - mail_dir:/var/vmail/vmail1 + depends_on: + - master_mariadb + diff --git a/Dockerfile b/ireddocker/Dockerfile similarity index 74% rename from Dockerfile rename to ireddocker/Dockerfile index 81fca98..66782cd 100644 --- a/Dockerfile +++ b/ireddocker/Dockerfile @@ -1,19 +1,19 @@ FROM ubuntu:bionic MAINTAINER Artem Shvidkiy RUN apt-get update -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y vim apt-utils postfix postfix-pcre libsasl2-modules ldap-utils postfix-ldap \ -libnet-ldap-perl libdbd-mysql-perl mariadb-server mariadb-client php-cli php-fpm php-json php-gd php-curl mcrypt \ -php-intl php-xml php-mbstring php-ldap php-mysql nginx-full dovecot-imapd dovecot-pop3d dovecot-lmtpd \ -dovecot-managesieved dovecot-sieve dovecot-ldap dovecot-mysql amavisd-new libcrypt-openssl-rsa-perl \ +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y vim apt-utils postfix postfix-pcre libsasl2-modules \ +ldap-utils postfix-ldap libnet-ldap-perl libdbd-mysql-perl mariadb-server mariadb-client php-cli \ +php-fpm php-json php-gd php-curl mcrypt php-intl php-xml php-mbstring php-ldap php-mysql \ +nginx-full dovecot-imapd dovecot-pop3d dovecot-lmtpd dovecot-managesieved dovecot-sieve \ +dovecot-ldap dovecot-mysql amavisd-new libcrypt-openssl-rsa-perl \ libmail-dkim-perl clamav-freshclam clamav-daemon spamassassin altermime arj nomarch cpio lzop cabextract \ p7zip-full rpm libmail-spf-perl unrar-free pax lrzip libclamunrar7 mlmmj python3-setuptools python3-pip \ python3-wheel python3-requests uwsgi uwsgi-plugin-python3 python3-ldap python3-pymysql php-net-ldap3 \ python3-sqlalchemy python3-dnspython python3-requests python3-pip python3-ldap python3-pymysql python-jinja2 \ -python-netifaces python-pycurl python-bcrypt python-dnspython python-webpy python-mysqldb \ +python-netifaces python-pycurl python-bcrypt python-dnspython python-webpy python-mysqldb syslog-ng \ python-requests uwsgi uwsgi-plugin-python python-ldap python-mysqldb python-pymysql bzip2 acl patch cron \ tofrodos logwatch unzip bsdutils liblz4-tool distro-info-data iso-codes libapt-inst2.0 lsb-release powermgmt-base \ python-apt-common python3-apt python3-software-properties software-properties-common unattended-upgrades wget dialog libodbc1 slapd -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y syslog-ng ADD main.cvd /var/lib/clamav/main.cvd RUN pip3 install web.py>=0.51 six>=1.15.0 ADD init-functions /lib/lsb/init-functions diff --git a/dockerinit.sh b/ireddocker/dockerinit.sh similarity index 92% rename from dockerinit.sh rename to ireddocker/dockerinit.sh index 06cc4ff..447f792 100644 --- a/dockerinit.sh +++ b/ireddocker/dockerinit.sh @@ -306,7 +306,38 @@ EOF touch /.configured + + /usr/sbin/syslog-ng -F --no-caps & + + + if [[ X"${MYSQLEXIST}" != X'YES' || X"${MYSQLEXIST}" != X'yes' ]]; then + service mysql restart + fi + + service dovecot restart + service nginx restart + service php7.2-fpm restart + service postfix restart + service clamav-daemon restart + service clamav-freshclam restart + service spamassasin restart + service amavis restart + service mlmmjadmin_enable restart + service uwsgi restart + + if [[ X"${LDAP_EXTERNAL_USE}" != X'YES' || X"${LDAP_EXTERNAL_USE}" != X'yes' ]]; then + service slapd restart + service iredapd restart + fi + + while true; do sleep 1; done + else +#does not start, if mysql stopped + + while ! mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do + sleep 1 + done # Start syslog-ng @@ -336,5 +367,8 @@ else service iredapd start fi - while true; do sleep 1; done + while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do + sleep 1 + done + fi diff --git a/init-functions b/ireddocker/init-functions similarity index 100% rename from init-functions rename to ireddocker/init-functions diff --git a/iredmail/ChangeLog b/ireddocker/iredmail/ChangeLog similarity index 100% rename from iredmail/ChangeLog rename to ireddocker/iredmail/ChangeLog diff --git a/iredmail/Documentations b/ireddocker/iredmail/Documentations similarity index 100% rename from iredmail/Documentations rename to ireddocker/iredmail/Documentations diff --git a/iredmail/conf/amavisd b/ireddocker/iredmail/conf/amavisd similarity index 100% rename from iredmail/conf/amavisd rename to ireddocker/iredmail/conf/amavisd diff --git a/iredmail/conf/clamav b/ireddocker/iredmail/conf/clamav similarity index 100% rename from iredmail/conf/clamav rename to ireddocker/iredmail/conf/clamav diff --git a/iredmail/conf/core b/ireddocker/iredmail/conf/core similarity index 100% rename from iredmail/conf/core rename to ireddocker/iredmail/conf/core diff --git a/iredmail/conf/dovecot b/ireddocker/iredmail/conf/dovecot similarity index 100% rename from iredmail/conf/dovecot rename to ireddocker/iredmail/conf/dovecot diff --git a/iredmail/conf/fail2ban b/ireddocker/iredmail/conf/fail2ban similarity index 100% rename from iredmail/conf/fail2ban rename to ireddocker/iredmail/conf/fail2ban diff --git a/iredmail/conf/global b/ireddocker/iredmail/conf/global similarity index 100% rename from iredmail/conf/global rename to ireddocker/iredmail/conf/global diff --git a/iredmail/conf/iredadmin b/ireddocker/iredmail/conf/iredadmin similarity index 100% rename from iredmail/conf/iredadmin rename to ireddocker/iredmail/conf/iredadmin diff --git a/iredmail/conf/iredapd b/ireddocker/iredmail/conf/iredapd similarity index 100% rename from iredmail/conf/iredapd rename to ireddocker/iredmail/conf/iredapd diff --git a/iredmail/conf/memcached b/ireddocker/iredmail/conf/memcached similarity index 100% rename from iredmail/conf/memcached rename to ireddocker/iredmail/conf/memcached diff --git a/iredmail/conf/mlmmj b/ireddocker/iredmail/conf/mlmmj similarity index 100% rename from iredmail/conf/mlmmj rename to ireddocker/iredmail/conf/mlmmj diff --git a/iredmail/conf/mysql b/ireddocker/iredmail/conf/mysql similarity index 100% rename from iredmail/conf/mysql rename to ireddocker/iredmail/conf/mysql diff --git a/iredmail/conf/netdata b/ireddocker/iredmail/conf/netdata similarity index 100% rename from iredmail/conf/netdata rename to ireddocker/iredmail/conf/netdata diff --git a/iredmail/conf/nginx b/ireddocker/iredmail/conf/nginx similarity index 100% rename from iredmail/conf/nginx rename to ireddocker/iredmail/conf/nginx diff --git a/iredmail/conf/openldap b/ireddocker/iredmail/conf/openldap similarity index 100% rename from iredmail/conf/openldap rename to ireddocker/iredmail/conf/openldap diff --git a/iredmail/conf/php b/ireddocker/iredmail/conf/php similarity index 100% rename from iredmail/conf/php rename to ireddocker/iredmail/conf/php diff --git a/iredmail/conf/postfix b/ireddocker/iredmail/conf/postfix similarity index 100% rename from iredmail/conf/postfix rename to ireddocker/iredmail/conf/postfix diff --git a/iredmail/conf/postgresql b/ireddocker/iredmail/conf/postgresql similarity index 100% rename from iredmail/conf/postgresql rename to ireddocker/iredmail/conf/postgresql diff --git a/iredmail/conf/roundcube b/ireddocker/iredmail/conf/roundcube similarity index 100% rename from iredmail/conf/roundcube rename to ireddocker/iredmail/conf/roundcube diff --git a/iredmail/conf/sogo b/ireddocker/iredmail/conf/sogo similarity index 100% rename from iredmail/conf/sogo rename to ireddocker/iredmail/conf/sogo diff --git a/iredmail/conf/spamassassin b/ireddocker/iredmail/conf/spamassassin similarity index 100% rename from iredmail/conf/spamassassin rename to ireddocker/iredmail/conf/spamassassin diff --git a/iredmail/conf/web_server b/ireddocker/iredmail/conf/web_server similarity index 100% rename from iredmail/conf/web_server rename to ireddocker/iredmail/conf/web_server diff --git a/iredmail/dialog/config_via_dialog.sh b/ireddocker/iredmail/dialog/config_via_dialog.sh similarity index 100% rename from iredmail/dialog/config_via_dialog.sh rename to ireddocker/iredmail/dialog/config_via_dialog.sh diff --git a/iredmail/dialog/ldap_config.sh b/ireddocker/iredmail/dialog/ldap_config.sh similarity index 100% rename from iredmail/dialog/ldap_config.sh rename to ireddocker/iredmail/dialog/ldap_config.sh diff --git a/iredmail/dialog/mysql_config.sh b/ireddocker/iredmail/dialog/mysql_config.sh similarity index 100% rename from iredmail/dialog/mysql_config.sh rename to ireddocker/iredmail/dialog/mysql_config.sh diff --git a/iredmail/dialog/optional_components.sh b/ireddocker/iredmail/dialog/optional_components.sh similarity index 100% rename from iredmail/dialog/optional_components.sh rename to ireddocker/iredmail/dialog/optional_components.sh diff --git a/iredmail/dialog/pgsql_config.sh b/ireddocker/iredmail/dialog/pgsql_config.sh similarity index 100% rename from iredmail/dialog/pgsql_config.sh rename to ireddocker/iredmail/dialog/pgsql_config.sh diff --git a/iredmail/dialog/virtual_domain_config.sh b/ireddocker/iredmail/dialog/virtual_domain_config.sh similarity index 100% rename from iredmail/dialog/virtual_domain_config.sh rename to ireddocker/iredmail/dialog/virtual_domain_config.sh diff --git a/iredmail/dialog/web_applications.sh b/ireddocker/iredmail/dialog/web_applications.sh similarity index 100% rename from iredmail/dialog/web_applications.sh rename to ireddocker/iredmail/dialog/web_applications.sh diff --git a/iredmail/functions/amavisd.sh b/ireddocker/iredmail/functions/amavisd.sh similarity index 100% rename from iredmail/functions/amavisd.sh rename to ireddocker/iredmail/functions/amavisd.sh diff --git a/iredmail/functions/backend.sh b/ireddocker/iredmail/functions/backend.sh similarity index 100% rename from iredmail/functions/backend.sh rename to ireddocker/iredmail/functions/backend.sh diff --git a/iredmail/functions/clamav.sh b/ireddocker/iredmail/functions/clamav.sh similarity index 100% rename from iredmail/functions/clamav.sh rename to ireddocker/iredmail/functions/clamav.sh diff --git a/iredmail/functions/cleanup.sh b/ireddocker/iredmail/functions/cleanup.sh similarity index 100% rename from iredmail/functions/cleanup.sh rename to ireddocker/iredmail/functions/cleanup.sh diff --git a/iredmail/functions/dovecot.sh b/ireddocker/iredmail/functions/dovecot.sh similarity index 100% rename from iredmail/functions/dovecot.sh rename to ireddocker/iredmail/functions/dovecot.sh diff --git a/iredmail/functions/fail2ban.sh b/ireddocker/iredmail/functions/fail2ban.sh similarity index 100% rename from iredmail/functions/fail2ban.sh rename to ireddocker/iredmail/functions/fail2ban.sh diff --git a/iredmail/functions/iredadmin.sh b/ireddocker/iredmail/functions/iredadmin.sh similarity index 100% rename from iredmail/functions/iredadmin.sh rename to ireddocker/iredmail/functions/iredadmin.sh diff --git a/iredmail/functions/iredapd.sh b/ireddocker/iredmail/functions/iredapd.sh similarity index 100% rename from iredmail/functions/iredapd.sh rename to ireddocker/iredmail/functions/iredapd.sh diff --git a/iredmail/functions/ldap_server.sh b/ireddocker/iredmail/functions/ldap_server.sh similarity index 100% rename from iredmail/functions/ldap_server.sh rename to ireddocker/iredmail/functions/ldap_server.sh diff --git a/iredmail/functions/mlmmj.sh b/ireddocker/iredmail/functions/mlmmj.sh similarity index 100% rename from iredmail/functions/mlmmj.sh rename to ireddocker/iredmail/functions/mlmmj.sh diff --git a/iredmail/functions/mysql.sh b/ireddocker/iredmail/functions/mysql.sh similarity index 100% rename from iredmail/functions/mysql.sh rename to ireddocker/iredmail/functions/mysql.sh diff --git a/iredmail/functions/netdata.sh b/ireddocker/iredmail/functions/netdata.sh similarity index 100% rename from iredmail/functions/netdata.sh rename to ireddocker/iredmail/functions/netdata.sh diff --git a/iredmail/functions/nginx.sh b/ireddocker/iredmail/functions/nginx.sh similarity index 100% rename from iredmail/functions/nginx.sh rename to ireddocker/iredmail/functions/nginx.sh diff --git a/iredmail/functions/openldap.sh b/ireddocker/iredmail/functions/openldap.sh similarity index 100% rename from iredmail/functions/openldap.sh rename to ireddocker/iredmail/functions/openldap.sh diff --git a/iredmail/functions/optional_components.sh b/ireddocker/iredmail/functions/optional_components.sh similarity index 100% rename from iredmail/functions/optional_components.sh rename to ireddocker/iredmail/functions/optional_components.sh diff --git a/iredmail/functions/packages.sh b/ireddocker/iredmail/functions/packages.sh similarity index 100% rename from iredmail/functions/packages.sh rename to ireddocker/iredmail/functions/packages.sh diff --git a/iredmail/functions/packages_freebsd.sh b/ireddocker/iredmail/functions/packages_freebsd.sh similarity index 100% rename from iredmail/functions/packages_freebsd.sh rename to ireddocker/iredmail/functions/packages_freebsd.sh diff --git a/iredmail/functions/php.sh b/ireddocker/iredmail/functions/php.sh similarity index 100% rename from iredmail/functions/php.sh rename to ireddocker/iredmail/functions/php.sh diff --git a/iredmail/functions/postfix.sh b/ireddocker/iredmail/functions/postfix.sh similarity index 100% rename from iredmail/functions/postfix.sh rename to ireddocker/iredmail/functions/postfix.sh diff --git a/iredmail/functions/postgresql.sh b/ireddocker/iredmail/functions/postgresql.sh similarity index 100% rename from iredmail/functions/postgresql.sh rename to ireddocker/iredmail/functions/postgresql.sh diff --git a/iredmail/functions/roundcubemail.sh b/ireddocker/iredmail/functions/roundcubemail.sh similarity index 100% rename from iredmail/functions/roundcubemail.sh rename to ireddocker/iredmail/functions/roundcubemail.sh diff --git a/iredmail/functions/sogo.sh b/ireddocker/iredmail/functions/sogo.sh similarity index 100% rename from iredmail/functions/sogo.sh rename to ireddocker/iredmail/functions/sogo.sh diff --git a/iredmail/functions/spamassassin.sh b/ireddocker/iredmail/functions/spamassassin.sh similarity index 100% rename from iredmail/functions/spamassassin.sh rename to ireddocker/iredmail/functions/spamassassin.sh diff --git a/iredmail/functions/system_accounts.sh b/ireddocker/iredmail/functions/system_accounts.sh similarity index 100% rename from iredmail/functions/system_accounts.sh rename to ireddocker/iredmail/functions/system_accounts.sh diff --git a/iredmail/functions/web_server.sh b/ireddocker/iredmail/functions/web_server.sh similarity index 100% rename from iredmail/functions/web_server.sh rename to ireddocker/iredmail/functions/web_server.sh diff --git a/iredmail/iRedMail.sh b/ireddocker/iredmail/iRedMail.sh similarity index 100% rename from iredmail/iRedMail.sh rename to ireddocker/iredmail/iRedMail.sh diff --git a/iredmail/pkgs/get_all.sh b/ireddocker/iredmail/pkgs/get_all.sh similarity index 100% rename from iredmail/pkgs/get_all.sh rename to ireddocker/iredmail/pkgs/get_all.sh diff --git a/iredmail/pkgs/pkgs.freebsd.sha256 b/ireddocker/iredmail/pkgs/pkgs.freebsd.sha256 similarity index 100% rename from iredmail/pkgs/pkgs.freebsd.sha256 rename to ireddocker/iredmail/pkgs/pkgs.freebsd.sha256 diff --git a/iredmail/pkgs/pkgs.openbsd.sha256 b/ireddocker/iredmail/pkgs/pkgs.openbsd.sha256 similarity index 100% rename from iredmail/pkgs/pkgs.openbsd.sha256 rename to ireddocker/iredmail/pkgs/pkgs.openbsd.sha256 diff --git a/iredmail/pkgs/pkgs.sha256 b/ireddocker/iredmail/pkgs/pkgs.sha256 similarity index 100% rename from iredmail/pkgs/pkgs.sha256 rename to ireddocker/iredmail/pkgs/pkgs.sha256 diff --git a/iredmail/samples/amavisd/amavisd.conf b/ireddocker/iredmail/samples/amavisd/amavisd.conf similarity index 100% rename from iredmail/samples/amavisd/amavisd.conf rename to ireddocker/iredmail/samples/amavisd/amavisd.conf diff --git a/iredmail/samples/amavisd/amavisd.mysql b/ireddocker/iredmail/samples/amavisd/amavisd.mysql similarity index 100% rename from iredmail/samples/amavisd/amavisd.mysql rename to ireddocker/iredmail/samples/amavisd/amavisd.mysql diff --git a/iredmail/samples/amavisd/amavisd.pgsql b/ireddocker/iredmail/samples/amavisd/amavisd.pgsql similarity index 100% rename from iredmail/samples/amavisd/amavisd.pgsql rename to ireddocker/iredmail/samples/amavisd/amavisd.pgsql diff --git a/iredmail/samples/amavisd/amavisd.schema b/ireddocker/iredmail/samples/amavisd/amavisd.schema similarity index 100% rename from iredmail/samples/amavisd/amavisd.schema rename to ireddocker/iredmail/samples/amavisd/amavisd.schema diff --git a/iredmail/samples/amavisd/default_spam_policy.sql b/ireddocker/iredmail/samples/amavisd/default_spam_policy.sql similarity index 100% rename from iredmail/samples/amavisd/default_spam_policy.sql rename to ireddocker/iredmail/samples/amavisd/default_spam_policy.sql diff --git a/iredmail/samples/dovecot/dovecot-last-login.conf b/ireddocker/iredmail/samples/dovecot/dovecot-last-login.conf similarity index 100% rename from iredmail/samples/dovecot/dovecot-last-login.conf rename to ireddocker/iredmail/samples/dovecot/dovecot-last-login.conf diff --git a/iredmail/samples/dovecot/dovecot-ldap.conf b/ireddocker/iredmail/samples/dovecot/dovecot-ldap.conf similarity index 100% rename from iredmail/samples/dovecot/dovecot-ldap.conf rename to ireddocker/iredmail/samples/dovecot/dovecot-ldap.conf diff --git a/iredmail/samples/dovecot/dovecot-share-folder.conf b/ireddocker/iredmail/samples/dovecot/dovecot-share-folder.conf similarity index 100% rename from iredmail/samples/dovecot/dovecot-share-folder.conf rename to ireddocker/iredmail/samples/dovecot/dovecot-share-folder.conf diff --git a/iredmail/samples/dovecot/dovecot-sql.conf b/ireddocker/iredmail/samples/dovecot/dovecot-sql.conf similarity index 100% rename from iredmail/samples/dovecot/dovecot-sql.conf rename to ireddocker/iredmail/samples/dovecot/dovecot-sql.conf diff --git a/iredmail/samples/dovecot/dovecot-used-quota.conf b/ireddocker/iredmail/samples/dovecot/dovecot-used-quota.conf similarity index 100% rename from iredmail/samples/dovecot/dovecot-used-quota.conf rename to ireddocker/iredmail/samples/dovecot/dovecot-used-quota.conf diff --git a/iredmail/samples/dovecot/dovecot.sieve b/ireddocker/iredmail/samples/dovecot/dovecot.sieve similarity index 100% rename from iredmail/samples/dovecot/dovecot.sieve rename to ireddocker/iredmail/samples/dovecot/dovecot.sieve diff --git a/iredmail/samples/dovecot/dovecot2-quota-warning.sh b/ireddocker/iredmail/samples/dovecot/dovecot2-quota-warning.sh similarity index 100% rename from iredmail/samples/dovecot/dovecot2-quota-warning.sh rename to ireddocker/iredmail/samples/dovecot/dovecot2-quota-warning.sh diff --git a/iredmail/samples/dovecot/dovecot22.conf b/ireddocker/iredmail/samples/dovecot/dovecot22.conf similarity index 100% rename from iredmail/samples/dovecot/dovecot22.conf rename to ireddocker/iredmail/samples/dovecot/dovecot22.conf diff --git a/iredmail/samples/dovecot/dovecot23.conf b/ireddocker/iredmail/samples/dovecot/dovecot23.conf similarity index 100% rename from iredmail/samples/dovecot/dovecot23.conf rename to ireddocker/iredmail/samples/dovecot/dovecot23.conf diff --git a/iredmail/samples/dovecot/sql/imap_share_folder.mysql b/ireddocker/iredmail/samples/dovecot/sql/imap_share_folder.mysql similarity index 100% rename from iredmail/samples/dovecot/sql/imap_share_folder.mysql rename to ireddocker/iredmail/samples/dovecot/sql/imap_share_folder.mysql diff --git a/iredmail/samples/dovecot/sql/last_login.mysql b/ireddocker/iredmail/samples/dovecot/sql/last_login.mysql similarity index 100% rename from iredmail/samples/dovecot/sql/last_login.mysql rename to ireddocker/iredmail/samples/dovecot/sql/last_login.mysql diff --git a/iredmail/samples/dovecot/sql/used_quota.mysql b/ireddocker/iredmail/samples/dovecot/sql/used_quota.mysql similarity index 100% rename from iredmail/samples/dovecot/sql/used_quota.mysql rename to ireddocker/iredmail/samples/dovecot/sql/used_quota.mysql diff --git a/iredmail/samples/dovecot/systemd/override.conf b/ireddocker/iredmail/samples/dovecot/systemd/override.conf similarity index 100% rename from iredmail/samples/dovecot/systemd/override.conf rename to ireddocker/iredmail/samples/dovecot/systemd/override.conf diff --git a/iredmail/samples/fail2ban/action.d/banned_db.conf b/ireddocker/iredmail/samples/fail2ban/action.d/banned_db.conf similarity index 100% rename from iredmail/samples/fail2ban/action.d/banned_db.conf rename to ireddocker/iredmail/samples/fail2ban/action.d/banned_db.conf diff --git a/iredmail/samples/fail2ban/bin/fail2ban_banned_db b/ireddocker/iredmail/samples/fail2ban/bin/fail2ban_banned_db similarity index 100% rename from iredmail/samples/fail2ban/bin/fail2ban_banned_db rename to ireddocker/iredmail/samples/fail2ban/bin/fail2ban_banned_db diff --git a/iredmail/samples/fail2ban/fail2ban.local b/ireddocker/iredmail/samples/fail2ban/fail2ban.local similarity index 100% rename from iredmail/samples/fail2ban/fail2ban.local rename to ireddocker/iredmail/samples/fail2ban/fail2ban.local diff --git a/iredmail/samples/fail2ban/filter.d/dovecot.iredmail.conf b/ireddocker/iredmail/samples/fail2ban/filter.d/dovecot.iredmail.conf similarity index 100% rename from iredmail/samples/fail2ban/filter.d/dovecot.iredmail.conf rename to ireddocker/iredmail/samples/fail2ban/filter.d/dovecot.iredmail.conf diff --git a/iredmail/samples/fail2ban/filter.d/postfix-pregreet.iredmail.conf b/ireddocker/iredmail/samples/fail2ban/filter.d/postfix-pregreet.iredmail.conf similarity index 100% rename from iredmail/samples/fail2ban/filter.d/postfix-pregreet.iredmail.conf rename to ireddocker/iredmail/samples/fail2ban/filter.d/postfix-pregreet.iredmail.conf diff --git a/iredmail/samples/fail2ban/filter.d/postfix.iredmail.conf b/ireddocker/iredmail/samples/fail2ban/filter.d/postfix.iredmail.conf similarity index 100% rename from iredmail/samples/fail2ban/filter.d/postfix.iredmail.conf rename to ireddocker/iredmail/samples/fail2ban/filter.d/postfix.iredmail.conf diff --git a/iredmail/samples/fail2ban/filter.d/roundcube.iredmail.conf b/ireddocker/iredmail/samples/fail2ban/filter.d/roundcube.iredmail.conf similarity index 100% rename from iredmail/samples/fail2ban/filter.d/roundcube.iredmail.conf rename to ireddocker/iredmail/samples/fail2ban/filter.d/roundcube.iredmail.conf diff --git a/iredmail/samples/fail2ban/jail.d/dovecot.local b/ireddocker/iredmail/samples/fail2ban/jail.d/dovecot.local similarity index 100% rename from iredmail/samples/fail2ban/jail.d/dovecot.local rename to ireddocker/iredmail/samples/fail2ban/jail.d/dovecot.local diff --git a/iredmail/samples/fail2ban/jail.d/nginx-http-auth.local b/ireddocker/iredmail/samples/fail2ban/jail.d/nginx-http-auth.local similarity index 100% rename from iredmail/samples/fail2ban/jail.d/nginx-http-auth.local rename to ireddocker/iredmail/samples/fail2ban/jail.d/nginx-http-auth.local diff --git a/iredmail/samples/fail2ban/jail.d/postfix-pregreet.local b/ireddocker/iredmail/samples/fail2ban/jail.d/postfix-pregreet.local similarity index 100% rename from iredmail/samples/fail2ban/jail.d/postfix-pregreet.local rename to ireddocker/iredmail/samples/fail2ban/jail.d/postfix-pregreet.local diff --git a/iredmail/samples/fail2ban/jail.d/postfix.local b/ireddocker/iredmail/samples/fail2ban/jail.d/postfix.local similarity index 100% rename from iredmail/samples/fail2ban/jail.d/postfix.local rename to ireddocker/iredmail/samples/fail2ban/jail.d/postfix.local diff --git a/iredmail/samples/fail2ban/jail.d/roundcube.local b/ireddocker/iredmail/samples/fail2ban/jail.d/roundcube.local similarity index 100% rename from iredmail/samples/fail2ban/jail.d/roundcube.local rename to ireddocker/iredmail/samples/fail2ban/jail.d/roundcube.local diff --git a/iredmail/samples/fail2ban/jail.d/sogo.local b/ireddocker/iredmail/samples/fail2ban/jail.d/sogo.local similarity index 100% rename from iredmail/samples/fail2ban/jail.d/sogo.local rename to ireddocker/iredmail/samples/fail2ban/jail.d/sogo.local diff --git a/iredmail/samples/fail2ban/jail.d/sshd.local b/ireddocker/iredmail/samples/fail2ban/jail.d/sshd.local similarity index 100% rename from iredmail/samples/fail2ban/jail.d/sshd.local rename to ireddocker/iredmail/samples/fail2ban/jail.d/sshd.local diff --git a/iredmail/samples/fail2ban/jail.local b/ireddocker/iredmail/samples/fail2ban/jail.local similarity index 100% rename from iredmail/samples/fail2ban/jail.local rename to ireddocker/iredmail/samples/fail2ban/jail.local diff --git a/iredmail/samples/fail2ban/openbsd/rc b/ireddocker/iredmail/samples/fail2ban/openbsd/rc similarity index 100% rename from iredmail/samples/fail2ban/openbsd/rc rename to ireddocker/iredmail/samples/fail2ban/openbsd/rc diff --git a/iredmail/samples/fail2ban/sql/fail2ban.mysql b/ireddocker/iredmail/samples/fail2ban/sql/fail2ban.mysql similarity index 100% rename from iredmail/samples/fail2ban/sql/fail2ban.mysql rename to ireddocker/iredmail/samples/fail2ban/sql/fail2ban.mysql diff --git a/iredmail/samples/fail2ban/sql/fail2ban.pgsql b/ireddocker/iredmail/samples/fail2ban/sql/fail2ban.pgsql similarity index 100% rename from iredmail/samples/fail2ban/sql/fail2ban.pgsql rename to ireddocker/iredmail/samples/fail2ban/sql/fail2ban.pgsql diff --git a/iredmail/samples/firewall/firewalld/services/ssh.xml b/ireddocker/iredmail/samples/firewall/firewalld/services/ssh.xml similarity index 100% rename from iredmail/samples/firewall/firewalld/services/ssh.xml rename to ireddocker/iredmail/samples/firewall/firewalld/services/ssh.xml diff --git a/iredmail/samples/firewall/firewalld/zones/iredmail.xml b/ireddocker/iredmail/samples/firewall/firewalld/zones/iredmail.xml similarity index 100% rename from iredmail/samples/firewall/firewalld/zones/iredmail.xml rename to ireddocker/iredmail/samples/firewall/firewalld/zones/iredmail.xml diff --git a/iredmail/samples/firewall/iptables/ip6tables.init.debian b/ireddocker/iredmail/samples/firewall/iptables/ip6tables.init.debian similarity index 100% rename from iredmail/samples/firewall/iptables/ip6tables.init.debian rename to ireddocker/iredmail/samples/firewall/iptables/ip6tables.init.debian diff --git a/iredmail/samples/firewall/iptables/ip6tables.rules b/ireddocker/iredmail/samples/firewall/iptables/ip6tables.rules similarity index 100% rename from iredmail/samples/firewall/iptables/ip6tables.rules rename to ireddocker/iredmail/samples/firewall/iptables/ip6tables.rules diff --git a/iredmail/samples/firewall/iptables/iptables.init.debian b/ireddocker/iredmail/samples/firewall/iptables/iptables.init.debian similarity index 100% rename from iredmail/samples/firewall/iptables/iptables.init.debian rename to ireddocker/iredmail/samples/firewall/iptables/iptables.init.debian diff --git a/iredmail/samples/firewall/iptables/iptables.rules b/ireddocker/iredmail/samples/firewall/iptables/iptables.rules similarity index 100% rename from iredmail/samples/firewall/iptables/iptables.rules rename to ireddocker/iredmail/samples/firewall/iptables/iptables.rules diff --git a/iredmail/samples/firewall/nftables.conf b/ireddocker/iredmail/samples/firewall/nftables.conf similarity index 100% rename from iredmail/samples/firewall/nftables.conf rename to ireddocker/iredmail/samples/firewall/nftables.conf diff --git a/iredmail/samples/freebsd/newsyslog.conf.d/dovecot b/ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/dovecot similarity index 100% rename from iredmail/samples/freebsd/newsyslog.conf.d/dovecot rename to ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/dovecot diff --git a/iredmail/samples/freebsd/newsyslog.conf.d/iredapd b/ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/iredapd similarity index 100% rename from iredmail/samples/freebsd/newsyslog.conf.d/iredapd rename to ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/iredapd diff --git a/iredmail/samples/freebsd/newsyslog.conf.d/mlmmjadmin b/ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/mlmmjadmin similarity index 100% rename from iredmail/samples/freebsd/newsyslog.conf.d/mlmmjadmin rename to ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/mlmmjadmin diff --git a/iredmail/samples/freebsd/newsyslog.conf.d/php-fpm b/ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/php-fpm similarity index 100% rename from iredmail/samples/freebsd/newsyslog.conf.d/php-fpm rename to ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/php-fpm diff --git a/iredmail/samples/freebsd/newsyslog.conf.d/slapd b/ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/slapd similarity index 100% rename from iredmail/samples/freebsd/newsyslog.conf.d/slapd rename to ireddocker/iredmail/samples/freebsd/newsyslog.conf.d/slapd diff --git a/iredmail/samples/freebsd/syslog.d/dovecot.conf b/ireddocker/iredmail/samples/freebsd/syslog.d/dovecot.conf similarity index 100% rename from iredmail/samples/freebsd/syslog.d/dovecot.conf rename to ireddocker/iredmail/samples/freebsd/syslog.d/dovecot.conf diff --git a/iredmail/samples/freebsd/syslog.d/fail2ban.conf b/ireddocker/iredmail/samples/freebsd/syslog.d/fail2ban.conf similarity index 100% rename from iredmail/samples/freebsd/syslog.d/fail2ban.conf rename to ireddocker/iredmail/samples/freebsd/syslog.d/fail2ban.conf diff --git a/iredmail/samples/freebsd/syslog.d/iredapd.conf b/ireddocker/iredmail/samples/freebsd/syslog.d/iredapd.conf similarity index 100% rename from iredmail/samples/freebsd/syslog.d/iredapd.conf rename to ireddocker/iredmail/samples/freebsd/syslog.d/iredapd.conf diff --git a/iredmail/samples/freebsd/syslog.d/mlmmjadmin.conf b/ireddocker/iredmail/samples/freebsd/syslog.d/mlmmjadmin.conf similarity index 100% rename from iredmail/samples/freebsd/syslog.d/mlmmjadmin.conf rename to ireddocker/iredmail/samples/freebsd/syslog.d/mlmmjadmin.conf diff --git a/iredmail/samples/freebsd/syslog.d/php-fpm.conf b/ireddocker/iredmail/samples/freebsd/syslog.d/php-fpm.conf similarity index 100% rename from iredmail/samples/freebsd/syslog.d/php-fpm.conf rename to ireddocker/iredmail/samples/freebsd/syslog.d/php-fpm.conf diff --git a/iredmail/samples/freebsd/syslog.d/slapd.conf b/ireddocker/iredmail/samples/freebsd/syslog.d/slapd.conf similarity index 100% rename from iredmail/samples/freebsd/syslog.d/slapd.conf rename to ireddocker/iredmail/samples/freebsd/syslog.d/slapd.conf diff --git a/iredmail/samples/iredmail/iredmail.mysql b/ireddocker/iredmail/samples/iredmail/iredmail.mysql similarity index 100% rename from iredmail/samples/iredmail/iredmail.mysql rename to ireddocker/iredmail/samples/iredmail/iredmail.mysql diff --git a/iredmail/samples/iredmail/iredmail.pgsql b/ireddocker/iredmail/samples/iredmail/iredmail.pgsql similarity index 100% rename from iredmail/samples/iredmail/iredmail.pgsql rename to ireddocker/iredmail/samples/iredmail/iredmail.pgsql diff --git a/iredmail/samples/iredmail/iredmail.schema b/ireddocker/iredmail/samples/iredmail/iredmail.schema similarity index 100% rename from iredmail/samples/iredmail/iredmail.schema rename to ireddocker/iredmail/samples/iredmail/iredmail.schema diff --git a/iredmail/samples/logrotate/dovecot b/ireddocker/iredmail/samples/logrotate/dovecot similarity index 100% rename from iredmail/samples/logrotate/dovecot rename to ireddocker/iredmail/samples/logrotate/dovecot diff --git a/iredmail/samples/logrotate/iredapd b/ireddocker/iredmail/samples/logrotate/iredapd similarity index 100% rename from iredmail/samples/logrotate/iredapd rename to ireddocker/iredmail/samples/logrotate/iredapd diff --git a/iredmail/samples/logrotate/mlmmjadmin b/ireddocker/iredmail/samples/logrotate/mlmmjadmin similarity index 100% rename from iredmail/samples/logrotate/mlmmjadmin rename to ireddocker/iredmail/samples/logrotate/mlmmjadmin diff --git a/iredmail/samples/logrotate/openldap b/ireddocker/iredmail/samples/logrotate/openldap similarity index 100% rename from iredmail/samples/logrotate/openldap rename to ireddocker/iredmail/samples/logrotate/openldap diff --git a/iredmail/samples/logrotate/php-fpm b/ireddocker/iredmail/samples/logrotate/php-fpm similarity index 100% rename from iredmail/samples/logrotate/php-fpm rename to ireddocker/iredmail/samples/logrotate/php-fpm diff --git a/iredmail/samples/mlmmj/mlmmj-amime-receive b/ireddocker/iredmail/samples/mlmmj/mlmmj-amime-receive similarity index 100% rename from iredmail/samples/mlmmj/mlmmj-amime-receive rename to ireddocker/iredmail/samples/mlmmj/mlmmj-amime-receive diff --git a/iredmail/samples/mlmmj/mlmmjadmin.settings.py b/ireddocker/iredmail/samples/mlmmj/mlmmjadmin.settings.py similarity index 100% rename from iredmail/samples/mlmmj/mlmmjadmin.settings.py rename to ireddocker/iredmail/samples/mlmmj/mlmmjadmin.settings.py diff --git a/iredmail/samples/mysql/my.cnf b/ireddocker/iredmail/samples/mysql/my.cnf similarity index 100% rename from iredmail/samples/mysql/my.cnf rename to ireddocker/iredmail/samples/mysql/my.cnf diff --git a/iredmail/samples/mysql/sql/add_first_domain_and_user.sql b/ireddocker/iredmail/samples/mysql/sql/add_first_domain_and_user.sql similarity index 100% rename from iredmail/samples/mysql/sql/add_first_domain_and_user.sql rename to ireddocker/iredmail/samples/mysql/sql/add_first_domain_and_user.sql diff --git a/iredmail/samples/mysql/sql/delete_anonymous_user.sql b/ireddocker/iredmail/samples/mysql/sql/delete_anonymous_user.sql similarity index 100% rename from iredmail/samples/mysql/sql/delete_anonymous_user.sql rename to ireddocker/iredmail/samples/mysql/sql/delete_anonymous_user.sql diff --git a/iredmail/samples/mysql/sql/init_vmail_db.sql b/ireddocker/iredmail/samples/mysql/sql/init_vmail_db.sql similarity index 100% rename from iredmail/samples/mysql/sql/init_vmail_db.sql rename to ireddocker/iredmail/samples/mysql/sql/init_vmail_db.sql diff --git a/iredmail/samples/mysql/sql/remote_grant_permission.sql b/ireddocker/iredmail/samples/mysql/sql/remote_grant_permission.sql similarity index 100% rename from iredmail/samples/mysql/sql/remote_grant_permission.sql rename to ireddocker/iredmail/samples/mysql/sql/remote_grant_permission.sql diff --git a/iredmail/samples/netdata/go.d.conf b/ireddocker/iredmail/samples/netdata/go.d.conf similarity index 100% rename from iredmail/samples/netdata/go.d.conf rename to ireddocker/iredmail/samples/netdata/go.d.conf diff --git a/iredmail/samples/netdata/go.d/mysql.conf b/ireddocker/iredmail/samples/netdata/go.d/mysql.conf similarity index 100% rename from iredmail/samples/netdata/go.d/mysql.conf rename to ireddocker/iredmail/samples/netdata/go.d/mysql.conf diff --git a/iredmail/samples/netdata/go.d/nginx.conf b/ireddocker/iredmail/samples/netdata/go.d/nginx.conf similarity index 100% rename from iredmail/samples/netdata/go.d/nginx.conf rename to ireddocker/iredmail/samples/netdata/go.d/nginx.conf diff --git a/iredmail/samples/netdata/go.d/phpfpm.conf b/ireddocker/iredmail/samples/netdata/go.d/phpfpm.conf similarity index 100% rename from iredmail/samples/netdata/go.d/phpfpm.conf rename to ireddocker/iredmail/samples/netdata/go.d/phpfpm.conf diff --git a/iredmail/samples/netdata/health_alarm_notify.conf b/ireddocker/iredmail/samples/netdata/health_alarm_notify.conf similarity index 100% rename from iredmail/samples/netdata/health_alarm_notify.conf rename to ireddocker/iredmail/samples/netdata/health_alarm_notify.conf diff --git a/iredmail/samples/netdata/netdata.conf b/ireddocker/iredmail/samples/netdata/netdata.conf similarity index 100% rename from iredmail/samples/netdata/netdata.conf rename to ireddocker/iredmail/samples/netdata/netdata.conf diff --git a/iredmail/samples/netdata/python.d.conf b/ireddocker/iredmail/samples/netdata/python.d.conf similarity index 100% rename from iredmail/samples/netdata/python.d.conf rename to ireddocker/iredmail/samples/netdata/python.d.conf diff --git a/iredmail/samples/netdata/python.d/openldap.conf b/ireddocker/iredmail/samples/netdata/python.d/openldap.conf similarity index 100% rename from iredmail/samples/netdata/python.d/openldap.conf rename to ireddocker/iredmail/samples/netdata/python.d/openldap.conf diff --git a/iredmail/samples/netdata/python.d/postgres.conf b/ireddocker/iredmail/samples/netdata/python.d/postgres.conf similarity index 100% rename from iredmail/samples/netdata/python.d/postgres.conf rename to ireddocker/iredmail/samples/netdata/python.d/postgres.conf diff --git a/iredmail/samples/netdata/systemd-limits.conf b/ireddocker/iredmail/samples/netdata/systemd-limits.conf similarity index 100% rename from iredmail/samples/netdata/systemd-limits.conf rename to ireddocker/iredmail/samples/netdata/systemd-limits.conf diff --git a/iredmail/samples/nginx/conf-available/0-general.conf b/ireddocker/iredmail/samples/nginx/conf-available/0-general.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/0-general.conf rename to ireddocker/iredmail/samples/nginx/conf-available/0-general.conf diff --git a/iredmail/samples/nginx/conf-available/cache.conf b/ireddocker/iredmail/samples/nginx/conf-available/cache.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/cache.conf rename to ireddocker/iredmail/samples/nginx/conf-available/cache.conf diff --git a/iredmail/samples/nginx/conf-available/client_max_body_size.conf b/ireddocker/iredmail/samples/nginx/conf-available/client_max_body_size.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/client_max_body_size.conf rename to ireddocker/iredmail/samples/nginx/conf-available/client_max_body_size.conf diff --git a/iredmail/samples/nginx/conf-available/default_type.conf b/ireddocker/iredmail/samples/nginx/conf-available/default_type.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/default_type.conf rename to ireddocker/iredmail/samples/nginx/conf-available/default_type.conf diff --git a/iredmail/samples/nginx/conf-available/gzip.conf b/ireddocker/iredmail/samples/nginx/conf-available/gzip.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/gzip.conf rename to ireddocker/iredmail/samples/nginx/conf-available/gzip.conf diff --git a/iredmail/samples/nginx/conf-available/headers.conf b/ireddocker/iredmail/samples/nginx/conf-available/headers.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/headers.conf rename to ireddocker/iredmail/samples/nginx/conf-available/headers.conf diff --git a/iredmail/samples/nginx/conf-available/log.conf b/ireddocker/iredmail/samples/nginx/conf-available/log.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/log.conf rename to ireddocker/iredmail/samples/nginx/conf-available/log.conf diff --git a/iredmail/samples/nginx/conf-available/mime_types.conf b/ireddocker/iredmail/samples/nginx/conf-available/mime_types.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/mime_types.conf rename to ireddocker/iredmail/samples/nginx/conf-available/mime_types.conf diff --git a/iredmail/samples/nginx/conf-available/php_fpm.conf b/ireddocker/iredmail/samples/nginx/conf-available/php_fpm.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/php_fpm.conf rename to ireddocker/iredmail/samples/nginx/conf-available/php_fpm.conf diff --git a/iredmail/samples/nginx/conf-available/sendfile.conf b/ireddocker/iredmail/samples/nginx/conf-available/sendfile.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/sendfile.conf rename to ireddocker/iredmail/samples/nginx/conf-available/sendfile.conf diff --git a/iredmail/samples/nginx/conf-available/server_tokens.conf b/ireddocker/iredmail/samples/nginx/conf-available/server_tokens.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/server_tokens.conf rename to ireddocker/iredmail/samples/nginx/conf-available/server_tokens.conf diff --git a/iredmail/samples/nginx/conf-available/types_hash_max_size.conf b/ireddocker/iredmail/samples/nginx/conf-available/types_hash_max_size.conf similarity index 100% rename from iredmail/samples/nginx/conf-available/types_hash_max_size.conf rename to ireddocker/iredmail/samples/nginx/conf-available/types_hash_max_size.conf diff --git a/iredmail/samples/nginx/nginx.conf b/ireddocker/iredmail/samples/nginx/nginx.conf similarity index 100% rename from iredmail/samples/nginx/nginx.conf rename to ireddocker/iredmail/samples/nginx/nginx.conf diff --git a/iredmail/samples/nginx/sites-available/00-default-ssl.conf b/ireddocker/iredmail/samples/nginx/sites-available/00-default-ssl.conf similarity index 100% rename from iredmail/samples/nginx/sites-available/00-default-ssl.conf rename to ireddocker/iredmail/samples/nginx/sites-available/00-default-ssl.conf diff --git a/iredmail/samples/nginx/sites-available/00-default.conf b/ireddocker/iredmail/samples/nginx/sites-available/00-default.conf similarity index 100% rename from iredmail/samples/nginx/sites-available/00-default.conf rename to ireddocker/iredmail/samples/nginx/sites-available/00-default.conf diff --git a/iredmail/samples/nginx/templates/adminer.tmpl b/ireddocker/iredmail/samples/nginx/templates/adminer.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/adminer.tmpl rename to ireddocker/iredmail/samples/nginx/templates/adminer.tmpl diff --git a/iredmail/samples/nginx/templates/fastcgi_php.tmpl b/ireddocker/iredmail/samples/nginx/templates/fastcgi_php.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/fastcgi_php.tmpl rename to ireddocker/iredmail/samples/nginx/templates/fastcgi_php.tmpl diff --git a/iredmail/samples/nginx/templates/hsts.tmpl b/ireddocker/iredmail/samples/nginx/templates/hsts.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/hsts.tmpl rename to ireddocker/iredmail/samples/nginx/templates/hsts.tmpl diff --git a/iredmail/samples/nginx/templates/iredadmin-subdomain.tmpl b/ireddocker/iredmail/samples/nginx/templates/iredadmin-subdomain.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/iredadmin-subdomain.tmpl rename to ireddocker/iredmail/samples/nginx/templates/iredadmin-subdomain.tmpl diff --git a/iredmail/samples/nginx/templates/iredadmin.tmpl b/ireddocker/iredmail/samples/nginx/templates/iredadmin.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/iredadmin.tmpl rename to ireddocker/iredmail/samples/nginx/templates/iredadmin.tmpl diff --git a/iredmail/samples/nginx/templates/misc.tmpl b/ireddocker/iredmail/samples/nginx/templates/misc.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/misc.tmpl rename to ireddocker/iredmail/samples/nginx/templates/misc.tmpl diff --git a/iredmail/samples/nginx/templates/netdata-subdomain.tmpl b/ireddocker/iredmail/samples/nginx/templates/netdata-subdomain.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/netdata-subdomain.tmpl rename to ireddocker/iredmail/samples/nginx/templates/netdata-subdomain.tmpl diff --git a/iredmail/samples/nginx/templates/netdata.tmpl b/ireddocker/iredmail/samples/nginx/templates/netdata.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/netdata.tmpl rename to ireddocker/iredmail/samples/nginx/templates/netdata.tmpl diff --git a/iredmail/samples/nginx/templates/php-catchall.tmpl b/ireddocker/iredmail/samples/nginx/templates/php-catchall.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/php-catchall.tmpl rename to ireddocker/iredmail/samples/nginx/templates/php-catchall.tmpl diff --git a/iredmail/samples/nginx/templates/redirect_to_https.tmpl b/ireddocker/iredmail/samples/nginx/templates/redirect_to_https.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/redirect_to_https.tmpl rename to ireddocker/iredmail/samples/nginx/templates/redirect_to_https.tmpl diff --git a/iredmail/samples/nginx/templates/roundcube-subdomain.tmpl b/ireddocker/iredmail/samples/nginx/templates/roundcube-subdomain.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/roundcube-subdomain.tmpl rename to ireddocker/iredmail/samples/nginx/templates/roundcube-subdomain.tmpl diff --git a/iredmail/samples/nginx/templates/roundcube.tmpl b/ireddocker/iredmail/samples/nginx/templates/roundcube.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/roundcube.tmpl rename to ireddocker/iredmail/samples/nginx/templates/roundcube.tmpl diff --git a/iredmail/samples/nginx/templates/sogo-subdomain.tmpl b/ireddocker/iredmail/samples/nginx/templates/sogo-subdomain.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/sogo-subdomain.tmpl rename to ireddocker/iredmail/samples/nginx/templates/sogo-subdomain.tmpl diff --git a/iredmail/samples/nginx/templates/sogo.tmpl b/ireddocker/iredmail/samples/nginx/templates/sogo.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/sogo.tmpl rename to ireddocker/iredmail/samples/nginx/templates/sogo.tmpl diff --git a/iredmail/samples/nginx/templates/ssl.tmpl b/ireddocker/iredmail/samples/nginx/templates/ssl.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/ssl.tmpl rename to ireddocker/iredmail/samples/nginx/templates/ssl.tmpl diff --git a/iredmail/samples/nginx/templates/stub_status.tmpl b/ireddocker/iredmail/samples/nginx/templates/stub_status.tmpl similarity index 100% rename from iredmail/samples/nginx/templates/stub_status.tmpl rename to ireddocker/iredmail/samples/nginx/templates/stub_status.tmpl diff --git a/iredmail/samples/openbsd/ldapd.conf b/ireddocker/iredmail/samples/openbsd/ldapd.conf similarity index 100% rename from iredmail/samples/openbsd/ldapd.conf rename to ireddocker/iredmail/samples/openbsd/ldapd.conf diff --git a/iredmail/samples/openbsd/pf.conf b/ireddocker/iredmail/samples/openbsd/pf.conf similarity index 100% rename from iredmail/samples/openbsd/pf.conf rename to ireddocker/iredmail/samples/openbsd/pf.conf diff --git a/iredmail/samples/openldap/calentry.schema b/ireddocker/iredmail/samples/openldap/calentry.schema similarity index 100% rename from iredmail/samples/openldap/calentry.schema rename to ireddocker/iredmail/samples/openldap/calentry.schema diff --git a/iredmail/samples/openldap/calresource.schema b/ireddocker/iredmail/samples/openldap/calresource.schema similarity index 100% rename from iredmail/samples/openldap/calresource.schema rename to ireddocker/iredmail/samples/openldap/calresource.schema diff --git a/iredmail/samples/openldap/ldap.conf b/ireddocker/iredmail/samples/openldap/ldap.conf similarity index 100% rename from iredmail/samples/openldap/ldap.conf rename to ireddocker/iredmail/samples/openldap/ldap.conf diff --git a/iredmail/samples/openldap/slapd.conf b/ireddocker/iredmail/samples/openldap/slapd.conf similarity index 100% rename from iredmail/samples/openldap/slapd.conf rename to ireddocker/iredmail/samples/openldap/slapd.conf diff --git a/iredmail/samples/php/fpm/pool.d/www.conf b/ireddocker/iredmail/samples/php/fpm/pool.d/www.conf similarity index 100% rename from iredmail/samples/php/fpm/pool.d/www.conf rename to ireddocker/iredmail/samples/php/fpm/pool.d/www.conf diff --git a/iredmail/samples/postfix/command_filter.pcre b/ireddocker/iredmail/samples/postfix/command_filter.pcre similarity index 100% rename from iredmail/samples/postfix/command_filter.pcre rename to ireddocker/iredmail/samples/postfix/command_filter.pcre diff --git a/iredmail/samples/postfix/freebsd/mailer.conf b/ireddocker/iredmail/samples/postfix/freebsd/mailer.conf similarity index 100% rename from iredmail/samples/postfix/freebsd/mailer.conf rename to ireddocker/iredmail/samples/postfix/freebsd/mailer.conf diff --git a/iredmail/samples/postfix/helo_access.pcre b/ireddocker/iredmail/samples/postfix/helo_access.pcre similarity index 100% rename from iredmail/samples/postfix/helo_access.pcre rename to ireddocker/iredmail/samples/postfix/helo_access.pcre diff --git a/iredmail/samples/postfix/ldap/catchall_maps.cf b/ireddocker/iredmail/samples/postfix/ldap/catchall_maps.cf similarity index 100% rename from iredmail/samples/postfix/ldap/catchall_maps.cf rename to ireddocker/iredmail/samples/postfix/ldap/catchall_maps.cf diff --git a/iredmail/samples/postfix/ldap/recipient_bcc_maps_domain.cf b/ireddocker/iredmail/samples/postfix/ldap/recipient_bcc_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/ldap/recipient_bcc_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/ldap/recipient_bcc_maps_domain.cf diff --git a/iredmail/samples/postfix/ldap/recipient_bcc_maps_user.cf b/ireddocker/iredmail/samples/postfix/ldap/recipient_bcc_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/ldap/recipient_bcc_maps_user.cf rename to ireddocker/iredmail/samples/postfix/ldap/recipient_bcc_maps_user.cf diff --git a/iredmail/samples/postfix/ldap/relay_domains.cf b/ireddocker/iredmail/samples/postfix/ldap/relay_domains.cf similarity index 100% rename from iredmail/samples/postfix/ldap/relay_domains.cf rename to ireddocker/iredmail/samples/postfix/ldap/relay_domains.cf diff --git a/iredmail/samples/postfix/ldap/sender_bcc_maps_domain.cf b/ireddocker/iredmail/samples/postfix/ldap/sender_bcc_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/ldap/sender_bcc_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/ldap/sender_bcc_maps_domain.cf diff --git a/iredmail/samples/postfix/ldap/sender_bcc_maps_user.cf b/ireddocker/iredmail/samples/postfix/ldap/sender_bcc_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/ldap/sender_bcc_maps_user.cf rename to ireddocker/iredmail/samples/postfix/ldap/sender_bcc_maps_user.cf diff --git a/iredmail/samples/postfix/ldap/sender_dependent_relayhost_maps_domain.cf b/ireddocker/iredmail/samples/postfix/ldap/sender_dependent_relayhost_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/ldap/sender_dependent_relayhost_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/ldap/sender_dependent_relayhost_maps_domain.cf diff --git a/iredmail/samples/postfix/ldap/sender_dependent_relayhost_maps_user.cf b/ireddocker/iredmail/samples/postfix/ldap/sender_dependent_relayhost_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/ldap/sender_dependent_relayhost_maps_user.cf rename to ireddocker/iredmail/samples/postfix/ldap/sender_dependent_relayhost_maps_user.cf diff --git a/iredmail/samples/postfix/ldap/sender_login_maps.cf b/ireddocker/iredmail/samples/postfix/ldap/sender_login_maps.cf similarity index 100% rename from iredmail/samples/postfix/ldap/sender_login_maps.cf rename to ireddocker/iredmail/samples/postfix/ldap/sender_login_maps.cf diff --git a/iredmail/samples/postfix/ldap/transport_maps_domain.cf b/ireddocker/iredmail/samples/postfix/ldap/transport_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/ldap/transport_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/ldap/transport_maps_domain.cf diff --git a/iredmail/samples/postfix/ldap/transport_maps_user.cf b/ireddocker/iredmail/samples/postfix/ldap/transport_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/ldap/transport_maps_user.cf rename to ireddocker/iredmail/samples/postfix/ldap/transport_maps_user.cf diff --git a/iredmail/samples/postfix/ldap/virtual_alias_maps.cf b/ireddocker/iredmail/samples/postfix/ldap/virtual_alias_maps.cf similarity index 100% rename from iredmail/samples/postfix/ldap/virtual_alias_maps.cf rename to ireddocker/iredmail/samples/postfix/ldap/virtual_alias_maps.cf diff --git a/iredmail/samples/postfix/ldap/virtual_group_maps.cf b/ireddocker/iredmail/samples/postfix/ldap/virtual_group_maps.cf similarity index 100% rename from iredmail/samples/postfix/ldap/virtual_group_maps.cf rename to ireddocker/iredmail/samples/postfix/ldap/virtual_group_maps.cf diff --git a/iredmail/samples/postfix/ldap/virtual_group_members_maps.cf b/ireddocker/iredmail/samples/postfix/ldap/virtual_group_members_maps.cf similarity index 100% rename from iredmail/samples/postfix/ldap/virtual_group_members_maps.cf rename to ireddocker/iredmail/samples/postfix/ldap/virtual_group_members_maps.cf diff --git a/iredmail/samples/postfix/ldap/virtual_mailbox_domains.cf b/ireddocker/iredmail/samples/postfix/ldap/virtual_mailbox_domains.cf similarity index 100% rename from iredmail/samples/postfix/ldap/virtual_mailbox_domains.cf rename to ireddocker/iredmail/samples/postfix/ldap/virtual_mailbox_domains.cf diff --git a/iredmail/samples/postfix/ldap/virtual_mailbox_maps.cf b/ireddocker/iredmail/samples/postfix/ldap/virtual_mailbox_maps.cf similarity index 100% rename from iredmail/samples/postfix/ldap/virtual_mailbox_maps.cf rename to ireddocker/iredmail/samples/postfix/ldap/virtual_mailbox_maps.cf diff --git a/iredmail/samples/postfix/main.cf b/ireddocker/iredmail/samples/postfix/main.cf similarity index 100% rename from iredmail/samples/postfix/main.cf rename to ireddocker/iredmail/samples/postfix/main.cf diff --git a/iredmail/samples/postfix/main.cf.amavisd b/ireddocker/iredmail/samples/postfix/main.cf.amavisd similarity index 100% rename from iredmail/samples/postfix/main.cf.amavisd rename to ireddocker/iredmail/samples/postfix/main.cf.amavisd diff --git a/iredmail/samples/postfix/main.cf.dovecot b/ireddocker/iredmail/samples/postfix/main.cf.dovecot similarity index 100% rename from iredmail/samples/postfix/main.cf.dovecot rename to ireddocker/iredmail/samples/postfix/main.cf.dovecot diff --git a/iredmail/samples/postfix/main.cf.ldap b/ireddocker/iredmail/samples/postfix/main.cf.ldap similarity index 100% rename from iredmail/samples/postfix/main.cf.ldap rename to ireddocker/iredmail/samples/postfix/main.cf.ldap diff --git a/iredmail/samples/postfix/main.cf.mlmmj b/ireddocker/iredmail/samples/postfix/main.cf.mlmmj similarity index 100% rename from iredmail/samples/postfix/main.cf.mlmmj rename to ireddocker/iredmail/samples/postfix/main.cf.mlmmj diff --git a/iredmail/samples/postfix/main.cf.mysql b/ireddocker/iredmail/samples/postfix/main.cf.mysql similarity index 100% rename from iredmail/samples/postfix/main.cf.mysql rename to ireddocker/iredmail/samples/postfix/main.cf.mysql diff --git a/iredmail/samples/postfix/main.cf.pgsql b/ireddocker/iredmail/samples/postfix/main.cf.pgsql similarity index 100% rename from iredmail/samples/postfix/main.cf.pgsql rename to ireddocker/iredmail/samples/postfix/main.cf.pgsql diff --git a/iredmail/samples/postfix/main.cf.postscreen b/ireddocker/iredmail/samples/postfix/main.cf.postscreen similarity index 100% rename from iredmail/samples/postfix/main.cf.postscreen rename to ireddocker/iredmail/samples/postfix/main.cf.postscreen diff --git a/iredmail/samples/postfix/master.cf b/ireddocker/iredmail/samples/postfix/master.cf similarity index 100% rename from iredmail/samples/postfix/master.cf rename to ireddocker/iredmail/samples/postfix/master.cf diff --git a/iredmail/samples/postfix/mysql/catchall_maps.cf b/ireddocker/iredmail/samples/postfix/mysql/catchall_maps.cf similarity index 100% rename from iredmail/samples/postfix/mysql/catchall_maps.cf rename to ireddocker/iredmail/samples/postfix/mysql/catchall_maps.cf diff --git a/iredmail/samples/postfix/mysql/domain_alias_catchall_maps.cf b/ireddocker/iredmail/samples/postfix/mysql/domain_alias_catchall_maps.cf similarity index 100% rename from iredmail/samples/postfix/mysql/domain_alias_catchall_maps.cf rename to ireddocker/iredmail/samples/postfix/mysql/domain_alias_catchall_maps.cf diff --git a/iredmail/samples/postfix/mysql/domain_alias_maps.cf b/ireddocker/iredmail/samples/postfix/mysql/domain_alias_maps.cf similarity index 100% rename from iredmail/samples/postfix/mysql/domain_alias_maps.cf rename to ireddocker/iredmail/samples/postfix/mysql/domain_alias_maps.cf diff --git a/iredmail/samples/postfix/mysql/recipient_bcc_maps_domain.cf b/ireddocker/iredmail/samples/postfix/mysql/recipient_bcc_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/mysql/recipient_bcc_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/mysql/recipient_bcc_maps_domain.cf diff --git a/iredmail/samples/postfix/mysql/recipient_bcc_maps_user.cf b/ireddocker/iredmail/samples/postfix/mysql/recipient_bcc_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/mysql/recipient_bcc_maps_user.cf rename to ireddocker/iredmail/samples/postfix/mysql/recipient_bcc_maps_user.cf diff --git a/iredmail/samples/postfix/mysql/relay_domains.cf b/ireddocker/iredmail/samples/postfix/mysql/relay_domains.cf similarity index 100% rename from iredmail/samples/postfix/mysql/relay_domains.cf rename to ireddocker/iredmail/samples/postfix/mysql/relay_domains.cf diff --git a/iredmail/samples/postfix/mysql/sender_bcc_maps_domain.cf b/ireddocker/iredmail/samples/postfix/mysql/sender_bcc_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/mysql/sender_bcc_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/mysql/sender_bcc_maps_domain.cf diff --git a/iredmail/samples/postfix/mysql/sender_bcc_maps_user.cf b/ireddocker/iredmail/samples/postfix/mysql/sender_bcc_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/mysql/sender_bcc_maps_user.cf rename to ireddocker/iredmail/samples/postfix/mysql/sender_bcc_maps_user.cf diff --git a/iredmail/samples/postfix/mysql/sender_dependent_relayhost_maps.cf b/ireddocker/iredmail/samples/postfix/mysql/sender_dependent_relayhost_maps.cf similarity index 100% rename from iredmail/samples/postfix/mysql/sender_dependent_relayhost_maps.cf rename to ireddocker/iredmail/samples/postfix/mysql/sender_dependent_relayhost_maps.cf diff --git a/iredmail/samples/postfix/mysql/sender_login_maps.cf b/ireddocker/iredmail/samples/postfix/mysql/sender_login_maps.cf similarity index 100% rename from iredmail/samples/postfix/mysql/sender_login_maps.cf rename to ireddocker/iredmail/samples/postfix/mysql/sender_login_maps.cf diff --git a/iredmail/samples/postfix/mysql/transport_maps_domain.cf b/ireddocker/iredmail/samples/postfix/mysql/transport_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/mysql/transport_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/mysql/transport_maps_domain.cf diff --git a/iredmail/samples/postfix/mysql/transport_maps_maillist.cf b/ireddocker/iredmail/samples/postfix/mysql/transport_maps_maillist.cf similarity index 100% rename from iredmail/samples/postfix/mysql/transport_maps_maillist.cf rename to ireddocker/iredmail/samples/postfix/mysql/transport_maps_maillist.cf diff --git a/iredmail/samples/postfix/mysql/transport_maps_user.cf b/ireddocker/iredmail/samples/postfix/mysql/transport_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/mysql/transport_maps_user.cf rename to ireddocker/iredmail/samples/postfix/mysql/transport_maps_user.cf diff --git a/iredmail/samples/postfix/mysql/virtual_alias_maps.cf b/ireddocker/iredmail/samples/postfix/mysql/virtual_alias_maps.cf similarity index 100% rename from iredmail/samples/postfix/mysql/virtual_alias_maps.cf rename to ireddocker/iredmail/samples/postfix/mysql/virtual_alias_maps.cf diff --git a/iredmail/samples/postfix/mysql/virtual_mailbox_domains.cf b/ireddocker/iredmail/samples/postfix/mysql/virtual_mailbox_domains.cf similarity index 100% rename from iredmail/samples/postfix/mysql/virtual_mailbox_domains.cf rename to ireddocker/iredmail/samples/postfix/mysql/virtual_mailbox_domains.cf diff --git a/iredmail/samples/postfix/mysql/virtual_mailbox_maps.cf b/ireddocker/iredmail/samples/postfix/mysql/virtual_mailbox_maps.cf similarity index 100% rename from iredmail/samples/postfix/mysql/virtual_mailbox_maps.cf rename to ireddocker/iredmail/samples/postfix/mysql/virtual_mailbox_maps.cf diff --git a/iredmail/samples/postfix/pgsql/catchall_maps.cf b/ireddocker/iredmail/samples/postfix/pgsql/catchall_maps.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/catchall_maps.cf rename to ireddocker/iredmail/samples/postfix/pgsql/catchall_maps.cf diff --git a/iredmail/samples/postfix/pgsql/domain_alias_catchall_maps.cf b/ireddocker/iredmail/samples/postfix/pgsql/domain_alias_catchall_maps.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/domain_alias_catchall_maps.cf rename to ireddocker/iredmail/samples/postfix/pgsql/domain_alias_catchall_maps.cf diff --git a/iredmail/samples/postfix/pgsql/domain_alias_maps.cf b/ireddocker/iredmail/samples/postfix/pgsql/domain_alias_maps.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/domain_alias_maps.cf rename to ireddocker/iredmail/samples/postfix/pgsql/domain_alias_maps.cf diff --git a/iredmail/samples/postfix/pgsql/recipient_bcc_maps_domain.cf b/ireddocker/iredmail/samples/postfix/pgsql/recipient_bcc_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/recipient_bcc_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/pgsql/recipient_bcc_maps_domain.cf diff --git a/iredmail/samples/postfix/pgsql/recipient_bcc_maps_user.cf b/ireddocker/iredmail/samples/postfix/pgsql/recipient_bcc_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/recipient_bcc_maps_user.cf rename to ireddocker/iredmail/samples/postfix/pgsql/recipient_bcc_maps_user.cf diff --git a/iredmail/samples/postfix/pgsql/relay_domains.cf b/ireddocker/iredmail/samples/postfix/pgsql/relay_domains.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/relay_domains.cf rename to ireddocker/iredmail/samples/postfix/pgsql/relay_domains.cf diff --git a/iredmail/samples/postfix/pgsql/sender_bcc_maps_domain.cf b/ireddocker/iredmail/samples/postfix/pgsql/sender_bcc_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/sender_bcc_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/pgsql/sender_bcc_maps_domain.cf diff --git a/iredmail/samples/postfix/pgsql/sender_bcc_maps_user.cf b/ireddocker/iredmail/samples/postfix/pgsql/sender_bcc_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/sender_bcc_maps_user.cf rename to ireddocker/iredmail/samples/postfix/pgsql/sender_bcc_maps_user.cf diff --git a/iredmail/samples/postfix/pgsql/sender_dependent_relayhost_maps.cf b/ireddocker/iredmail/samples/postfix/pgsql/sender_dependent_relayhost_maps.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/sender_dependent_relayhost_maps.cf rename to ireddocker/iredmail/samples/postfix/pgsql/sender_dependent_relayhost_maps.cf diff --git a/iredmail/samples/postfix/pgsql/sender_login_maps.cf b/ireddocker/iredmail/samples/postfix/pgsql/sender_login_maps.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/sender_login_maps.cf rename to ireddocker/iredmail/samples/postfix/pgsql/sender_login_maps.cf diff --git a/iredmail/samples/postfix/pgsql/transport_maps_domain.cf b/ireddocker/iredmail/samples/postfix/pgsql/transport_maps_domain.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/transport_maps_domain.cf rename to ireddocker/iredmail/samples/postfix/pgsql/transport_maps_domain.cf diff --git a/iredmail/samples/postfix/pgsql/transport_maps_maillist.cf b/ireddocker/iredmail/samples/postfix/pgsql/transport_maps_maillist.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/transport_maps_maillist.cf rename to ireddocker/iredmail/samples/postfix/pgsql/transport_maps_maillist.cf diff --git a/iredmail/samples/postfix/pgsql/transport_maps_user.cf b/ireddocker/iredmail/samples/postfix/pgsql/transport_maps_user.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/transport_maps_user.cf rename to ireddocker/iredmail/samples/postfix/pgsql/transport_maps_user.cf diff --git a/iredmail/samples/postfix/pgsql/virtual_alias_maps.cf b/ireddocker/iredmail/samples/postfix/pgsql/virtual_alias_maps.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/virtual_alias_maps.cf rename to ireddocker/iredmail/samples/postfix/pgsql/virtual_alias_maps.cf diff --git a/iredmail/samples/postfix/pgsql/virtual_mailbox_domains.cf b/ireddocker/iredmail/samples/postfix/pgsql/virtual_mailbox_domains.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/virtual_mailbox_domains.cf rename to ireddocker/iredmail/samples/postfix/pgsql/virtual_mailbox_domains.cf diff --git a/iredmail/samples/postfix/pgsql/virtual_mailbox_maps.cf b/ireddocker/iredmail/samples/postfix/pgsql/virtual_mailbox_maps.cf similarity index 100% rename from iredmail/samples/postfix/pgsql/virtual_mailbox_maps.cf rename to ireddocker/iredmail/samples/postfix/pgsql/virtual_mailbox_maps.cf diff --git a/iredmail/samples/postfix/postscreen_access.cidr b/ireddocker/iredmail/samples/postfix/postscreen_access.cidr similarity index 100% rename from iredmail/samples/postfix/postscreen_access.cidr rename to ireddocker/iredmail/samples/postfix/postscreen_access.cidr diff --git a/iredmail/samples/postgresql/sql/add_first_domain_and_user.sql b/ireddocker/iredmail/samples/postgresql/sql/add_first_domain_and_user.sql similarity index 100% rename from iredmail/samples/postgresql/sql/add_first_domain_and_user.sql rename to ireddocker/iredmail/samples/postgresql/sql/add_first_domain_and_user.sql diff --git a/iredmail/samples/postgresql/sql/grant_permissions.sql b/ireddocker/iredmail/samples/postgresql/sql/grant_permissions.sql similarity index 100% rename from iredmail/samples/postgresql/sql/grant_permissions.sql rename to ireddocker/iredmail/samples/postgresql/sql/grant_permissions.sql diff --git a/iredmail/samples/postgresql/sql/init_vmail_db.sql b/ireddocker/iredmail/samples/postgresql/sql/init_vmail_db.sql similarity index 100% rename from iredmail/samples/postgresql/sql/init_vmail_db.sql rename to ireddocker/iredmail/samples/postgresql/sql/init_vmail_db.sql diff --git a/iredmail/samples/roundcubemail/config.inc.php b/ireddocker/iredmail/samples/roundcubemail/config.inc.php similarity index 100% rename from iredmail/samples/roundcubemail/config.inc.php rename to ireddocker/iredmail/samples/roundcubemail/config.inc.php diff --git a/iredmail/samples/roundcubemail/global_ldap_address_book.inc.php b/ireddocker/iredmail/samples/roundcubemail/global_ldap_address_book.inc.php similarity index 100% rename from iredmail/samples/roundcubemail/global_ldap_address_book.inc.php rename to ireddocker/iredmail/samples/roundcubemail/global_ldap_address_book.inc.php diff --git a/iredmail/samples/rsyslog.d/1-iredmail-dovecot.conf b/ireddocker/iredmail/samples/rsyslog.d/1-iredmail-dovecot.conf similarity index 100% rename from iredmail/samples/rsyslog.d/1-iredmail-dovecot.conf rename to ireddocker/iredmail/samples/rsyslog.d/1-iredmail-dovecot.conf diff --git a/iredmail/samples/rsyslog.d/1-iredmail-fail2ban.conf b/ireddocker/iredmail/samples/rsyslog.d/1-iredmail-fail2ban.conf similarity index 100% rename from iredmail/samples/rsyslog.d/1-iredmail-fail2ban.conf rename to ireddocker/iredmail/samples/rsyslog.d/1-iredmail-fail2ban.conf diff --git a/iredmail/samples/rsyslog.d/1-iredmail-iredapd.conf b/ireddocker/iredmail/samples/rsyslog.d/1-iredmail-iredapd.conf similarity index 100% rename from iredmail/samples/rsyslog.d/1-iredmail-iredapd.conf rename to ireddocker/iredmail/samples/rsyslog.d/1-iredmail-iredapd.conf diff --git a/iredmail/samples/rsyslog.d/1-iredmail-mlmmjadmin.conf b/ireddocker/iredmail/samples/rsyslog.d/1-iredmail-mlmmjadmin.conf similarity index 100% rename from iredmail/samples/rsyslog.d/1-iredmail-mlmmjadmin.conf rename to ireddocker/iredmail/samples/rsyslog.d/1-iredmail-mlmmjadmin.conf diff --git a/iredmail/samples/rsyslog.d/1-iredmail-openldap.conf b/ireddocker/iredmail/samples/rsyslog.d/1-iredmail-openldap.conf similarity index 100% rename from iredmail/samples/rsyslog.d/1-iredmail-openldap.conf rename to ireddocker/iredmail/samples/rsyslog.d/1-iredmail-openldap.conf diff --git a/iredmail/samples/rsyslog.d/1-iredmail-phpfpm.conf b/ireddocker/iredmail/samples/rsyslog.d/1-iredmail-phpfpm.conf similarity index 100% rename from iredmail/samples/rsyslog.d/1-iredmail-phpfpm.conf rename to ireddocker/iredmail/samples/rsyslog.d/1-iredmail-phpfpm.conf diff --git a/iredmail/samples/sogo/sogo.conf b/ireddocker/iredmail/samples/sogo/sogo.conf similarity index 100% rename from iredmail/samples/sogo/sogo.conf rename to ireddocker/iredmail/samples/sogo/sogo.conf diff --git a/iredmail/samples/sogo/sogo.cron b/ireddocker/iredmail/samples/sogo/sogo.cron similarity index 100% rename from iredmail/samples/sogo/sogo.cron rename to ireddocker/iredmail/samples/sogo/sogo.cron diff --git a/iredmail/samples/spamassassin/local.cf b/ireddocker/iredmail/samples/spamassassin/local.cf similarity index 100% rename from iredmail/samples/spamassassin/local.cf rename to ireddocker/iredmail/samples/spamassassin/local.cf diff --git a/iredmail/samples/spamassassin/razor.conf b/ireddocker/iredmail/samples/spamassassin/razor.conf similarity index 100% rename from iredmail/samples/spamassassin/razor.conf rename to ireddocker/iredmail/samples/spamassassin/razor.conf diff --git a/iredmail/samples/systemd/clamd.service.d/override.conf b/ireddocker/iredmail/samples/systemd/clamd.service.d/override.conf similarity index 100% rename from iredmail/samples/systemd/clamd.service.d/override.conf rename to ireddocker/iredmail/samples/systemd/clamd.service.d/override.conf diff --git a/iredmail/samples/systemd/mariadb.service.d/override.conf b/ireddocker/iredmail/samples/systemd/mariadb.service.d/override.conf similarity index 100% rename from iredmail/samples/systemd/mariadb.service.d/override.conf rename to ireddocker/iredmail/samples/systemd/mariadb.service.d/override.conf diff --git a/iredmail/samples/systemd/slapd.service.d/override.conf b/ireddocker/iredmail/samples/systemd/slapd.service.d/override.conf similarity index 100% rename from iredmail/samples/systemd/slapd.service.d/override.conf rename to ireddocker/iredmail/samples/systemd/slapd.service.d/override.conf diff --git a/iredmail/samples/yum/CentOS-AppStream.repo b/ireddocker/iredmail/samples/yum/CentOS-AppStream.repo similarity index 100% rename from iredmail/samples/yum/CentOS-AppStream.repo rename to ireddocker/iredmail/samples/yum/CentOS-AppStream.repo diff --git a/iredmail/samples/yum/CentOS-PowerTools.repo b/ireddocker/iredmail/samples/yum/CentOS-PowerTools.repo similarity index 100% rename from iredmail/samples/yum/CentOS-PowerTools.repo rename to ireddocker/iredmail/samples/yum/CentOS-PowerTools.repo diff --git a/iredmail/samples/yum/symas-openldap.repo b/ireddocker/iredmail/samples/yum/symas-openldap.repo similarity index 100% rename from iredmail/samples/yum/symas-openldap.repo rename to ireddocker/iredmail/samples/yum/symas-openldap.repo diff --git a/iredmail/tools/backup_mysql.sh b/ireddocker/iredmail/tools/backup_mysql.sh similarity index 100% rename from iredmail/tools/backup_mysql.sh rename to ireddocker/iredmail/tools/backup_mysql.sh diff --git a/iredmail/tools/backup_openldap.sh b/ireddocker/iredmail/tools/backup_openldap.sh similarity index 100% rename from iredmail/tools/backup_openldap.sh rename to ireddocker/iredmail/tools/backup_openldap.sh diff --git a/iredmail/tools/backup_pgsql.sh b/ireddocker/iredmail/tools/backup_pgsql.sh similarity index 100% rename from iredmail/tools/backup_pgsql.sh rename to ireddocker/iredmail/tools/backup_pgsql.sh diff --git a/iredmail/tools/backup_sogo.sh b/ireddocker/iredmail/tools/backup_sogo.sh similarity index 100% rename from iredmail/tools/backup_sogo.sh rename to ireddocker/iredmail/tools/backup_sogo.sh diff --git a/iredmail/tools/create_mail_user_OpenLDAP.py b/ireddocker/iredmail/tools/create_mail_user_OpenLDAP.py similarity index 100% rename from iredmail/tools/create_mail_user_OpenLDAP.py rename to ireddocker/iredmail/tools/create_mail_user_OpenLDAP.py diff --git a/iredmail/tools/create_mail_user_OpenLDAP.sh b/ireddocker/iredmail/tools/create_mail_user_OpenLDAP.sh similarity index 100% rename from iredmail/tools/create_mail_user_OpenLDAP.sh rename to ireddocker/iredmail/tools/create_mail_user_OpenLDAP.sh diff --git a/iredmail/tools/create_mail_user_SQL.sh b/ireddocker/iredmail/tools/create_mail_user_SQL.sh similarity index 100% rename from iredmail/tools/create_mail_user_SQL.sh rename to ireddocker/iredmail/tools/create_mail_user_SQL.sh diff --git a/iredmail/tools/enable_postscreen.sh b/ireddocker/iredmail/tools/enable_postscreen.sh similarity index 100% rename from iredmail/tools/enable_postscreen.sh rename to ireddocker/iredmail/tools/enable_postscreen.sh diff --git a/iredmail/tools/fail2ban_unban_ip.sh b/ireddocker/iredmail/tools/fail2ban_unban_ip.sh similarity index 100% rename from iredmail/tools/fail2ban_unban_ip.sh rename to ireddocker/iredmail/tools/fail2ban_unban_ip.sh diff --git a/iredmail/tools/find_sasl_login_ip.sh b/ireddocker/iredmail/tools/find_sasl_login_ip.sh similarity index 100% rename from iredmail/tools/find_sasl_login_ip.sh rename to ireddocker/iredmail/tools/find_sasl_login_ip.sh diff --git a/iredmail/tools/find_top_sasl_usernames.sh b/ireddocker/iredmail/tools/find_top_sasl_usernames.sh similarity index 100% rename from iredmail/tools/find_top_sasl_usernames.sh rename to ireddocker/iredmail/tools/find_top_sasl_usernames.sh diff --git a/iredmail/tools/generate_ssl_keys.sh b/ireddocker/iredmail/tools/generate_ssl_keys.sh similarity index 100% rename from iredmail/tools/generate_ssl_keys.sh rename to ireddocker/iredmail/tools/generate_ssl_keys.sh diff --git a/iredmail/tools/ldap_assign_user_to_groups.py b/ireddocker/iredmail/tools/ldap_assign_user_to_groups.py similarity index 100% rename from iredmail/tools/ldap_assign_user_to_groups.py rename to ireddocker/iredmail/tools/ldap_assign_user_to_groups.py diff --git a/iredmail/tools/ldap_move_members_to_another_group.py b/ireddocker/iredmail/tools/ldap_move_members_to_another_group.py similarity index 100% rename from iredmail/tools/ldap_move_members_to_another_group.py rename to ireddocker/iredmail/tools/ldap_move_members_to_another_group.py diff --git a/iredmail/tools/migrate_sql_alias_table.py b/ireddocker/iredmail/tools/migrate_sql_alias_table.py similarity index 100% rename from iredmail/tools/migrate_sql_alias_table.py rename to ireddocker/iredmail/tools/migrate_sql_alias_table.py diff --git a/iredmail/update/0.9.8/amavisd.mysql b/ireddocker/iredmail/update/0.9.8/amavisd.mysql similarity index 100% rename from iredmail/update/0.9.8/amavisd.mysql rename to ireddocker/iredmail/update/0.9.8/amavisd.mysql diff --git a/iredmail/update/0.9.8/amavisd.pgsql b/ireddocker/iredmail/update/0.9.8/amavisd.pgsql similarity index 100% rename from iredmail/update/0.9.8/amavisd.pgsql rename to ireddocker/iredmail/update/0.9.8/amavisd.pgsql diff --git a/iredmail/update/0.9.8/iredmail.mysql b/ireddocker/iredmail/update/0.9.8/iredmail.mysql similarity index 100% rename from iredmail/update/0.9.8/iredmail.mysql rename to ireddocker/iredmail/update/0.9.8/iredmail.mysql diff --git a/iredmail/update/0.9.8/iredmail.pgsql b/ireddocker/iredmail/update/0.9.8/iredmail.pgsql similarity index 100% rename from iredmail/update/0.9.8/iredmail.pgsql rename to ireddocker/iredmail/update/0.9.8/iredmail.pgsql diff --git a/iredmail/update/0.9.9/iredmail.mysql b/ireddocker/iredmail/update/0.9.9/iredmail.mysql similarity index 100% rename from iredmail/update/0.9.9/iredmail.mysql rename to ireddocker/iredmail/update/0.9.9/iredmail.mysql diff --git a/iredmail/update/0.9.9/iredmail.pgsql b/ireddocker/iredmail/update/0.9.9/iredmail.pgsql similarity index 100% rename from iredmail/update/0.9.9/iredmail.pgsql rename to ireddocker/iredmail/update/0.9.9/iredmail.pgsql diff --git a/iredmail/update/1.0/iredmail.mysql b/ireddocker/iredmail/update/1.0/iredmail.mysql similarity index 100% rename from iredmail/update/1.0/iredmail.mysql rename to ireddocker/iredmail/update/1.0/iredmail.mysql diff --git a/iredmail/update/1.0/iredmail.pgsql b/ireddocker/iredmail/update/1.0/iredmail.pgsql similarity index 100% rename from iredmail/update/1.0/iredmail.pgsql rename to ireddocker/iredmail/update/1.0/iredmail.pgsql diff --git a/iredmail/update/1.2/last_login.mysql b/ireddocker/iredmail/update/1.2/last_login.mysql similarity index 100% rename from iredmail/update/1.2/last_login.mysql rename to ireddocker/iredmail/update/1.2/last_login.mysql diff --git a/iredmail/update/README.md b/ireddocker/iredmail/update/README.md similarity index 100% rename from iredmail/update/README.md rename to ireddocker/iredmail/update/README.md diff --git a/iredmail/update/ldap/README.md b/ireddocker/iredmail/update/ldap/README.md similarity index 100% rename from iredmail/update/ldap/README.md rename to ireddocker/iredmail/update/ldap/README.md diff --git a/iredmail/update/ldap/update-ldap-dovecot-2.3.py b/ireddocker/iredmail/update/ldap/update-ldap-dovecot-2.3.py similarity index 100% rename from iredmail/update/ldap/update-ldap-dovecot-2.3.py rename to ireddocker/iredmail/update/ldap/update-ldap-dovecot-2.3.py diff --git a/iredmail/update/ldap/updateLDAPValues_050_to_051.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_050_to_051.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_050_to_051.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_050_to_051.py diff --git a/iredmail/update/ldap/updateLDAPValues_051_to_060.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_051_to_060.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_051_to_060.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_051_to_060.py diff --git a/iredmail/update/ldap/updateLDAPValues_061_to_070.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_061_to_070.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_061_to_070.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_061_to_070.py diff --git a/iredmail/update/ldap/updateLDAPValues_072_to_073.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_072_to_073.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_072_to_073.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_072_to_073.py diff --git a/iredmail/update/ldap/updateLDAPValues_074_to_080.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_074_to_080.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_074_to_080.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_074_to_080.py diff --git a/iredmail/update/ldap/updateLDAPValues_080_to_081.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_080_to_081.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_080_to_081.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_080_to_081.py diff --git a/iredmail/update/ldap/updateLDAPValues_083_to_084.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_083_to_084.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_083_to_084.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_083_to_084.py diff --git a/iredmail/update/ldap/updateLDAPValues_086_to_087.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_086_to_087.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_086_to_087.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_086_to_087.py diff --git a/iredmail/update/ldap/updateLDAPValues_087_to_090.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_087_to_090.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_087_to_090.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_087_to_090.py diff --git a/iredmail/update/ldap/updateLDAPValues_094_to_095.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_094_to_095.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_094_to_095.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_094_to_095.py diff --git a/iredmail/update/ldap/updateLDAPValues_095_1_to_096.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_095_1_to_096.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_095_1_to_096.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_095_1_to_096.py diff --git a/iredmail/update/ldap/updateLDAPValues_099_to_1.py b/ireddocker/iredmail/update/ldap/updateLDAPValues_099_to_1.py similarity index 100% rename from iredmail/update/ldap/updateLDAPValues_099_to_1.py rename to ireddocker/iredmail/update/ldap/updateLDAPValues_099_to_1.py diff --git a/iredmail/README.md b/iredmail/README.md deleted file mode 100644 index 841c5b8..0000000 --- a/iredmail/README.md +++ /dev/null @@ -1,29 +0,0 @@ -iRedMail is a full-featured mail server solution. It supports few mainstream -Linux/BSD distributions: - -- CentOS 7, 8 -- Debian 10 (recommended), 9 -- Ubuntu 18.04, 20.04 -- FreeBSD 12.x -- OpenBSD 6.7 - -More info: - -- License: GPL v3 -- Authors: Zhang Huangbin (zhb _at_ iredmail.org) -- Check and download the latest stable release from [website](https://www.iredmail.org/download.html) -- Install iRedMail by following our installation guides strictly: - [Installation Guides](https://docs.iredmail.org/#install) -- Community, bug report, feature requests: - [online support forum](https://forum.iredmail.org/) -- We offer [paid support services](https://www.iredmail.org/support.html) -- Source packages patched or modified for RHEL/CentOS can be found - [here](https://dl.iredmail.org/yum/srpms/), other RPM packages are all - installed from official yum repository and - [EPEL](http://fedoraproject.org/wiki/EPEL). - -We recommend to deploy iRedMail server with the [iRedMail Easy platform](https://www.iredmail.org/easy.html), -it offers easy deployment, one-click upgrade, and tech support via the ticket -system. Check our [website](https://www.iredmail.org/easy.html) for more details. - -There's also an all-in-one Docker edition here: [iredmail/dockerized](https://github.com/iredmail/dockerized). diff --git a/mariadb/master.cnf b/mariadb/master.cnf index e69de29..b9aeee0 100644 --- a/mariadb/master.cnf +++ b/mariadb/master.cnf @@ -0,0 +1,9 @@ +[mysqld] + +server-id = 101 +log_bin = /var/log/mysql/mysql-bin.log +binlog_do_db = amavisd +binlog_do_db = iredadmin +binlog_do_db = iredapd +binlog_do_db = roundcubemail +bind-address = 0.0.0.0 diff --git a/mariadb/slave.cnf b/mariadb/slave.cnf new file mode 100644 index 0000000..1fcda8f --- /dev/null +++ b/mariadb/slave.cnf @@ -0,0 +1,10 @@ +[mysqld] + +server-id = 102 +log_bin = /var/log/mysql/mysql-bin.log +relay-log = /var/log/mysql/mysql-relay-bin.log +binlog_do_db = amavisd +binlog_do_db = iredadmin +binlog_do_db = iredapd +binlog_do_db = roundcubemail +bind-address = 0.0.0.0 diff --git a/test.sh b/test.sh deleted file mode 100755 index 9a21a38..0000000 --- a/test.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -#if [[ ! -f ".configured" ]]; then -# touch .configured -#else -# while true; do sleep 1; done -#fi -: ${MYSQLEXIST:=NO} - - if [ X"${MYSQLEXIST}" == X'YES' ]; then - echo test - else - echo notest - fi - -cat < /root/testfile -export STORAGE_BASE_DIR=\'STORAGE_BASE_DIR\' -export WEB_SERVER=\'WEB_SERVER\' -EOF diff --git a/testfile b/testfile deleted file mode 100644 index c766c8f..0000000 --- a/testfile +++ /dev/null @@ -1,25 +0,0 @@ -export STORAGE_BASE_DIR='' -export WEB_SERVER='' -export BACKEND_ORIG='' -export BACKEND='' -export VMAIL_DB_BIND_PASSWD='' -export VMAIL_DB_ADMIN_PASSWD='' -export MLMMJADMIN_API_AUTH_TOKEN='' -export NETDATA_DB_PASSWD='' -export LDAP_SUFFIX='' -export LDAP_BINDPW='' -export LDAP_ADMIN_PW='' -export LDAP_ROOTPW='' -export MYSQL_ROOT_PASSWD='' -export FIRST_DOMAIN='' -export DOMAIN_ADMIN_PASSWD_PLAIN='' -export USE_IREDADMIN='' -export USE_ROUNDCUBE='' -export AMAVISD_DB_PASSWD='' -export IREDADMIN_DB_PASSWD='' -export RCM_DB_PASSWD='' -export SOGO_DB_PASSWD='' -export SOGO_SIEVE_MASTER_PASSWD='' -export IREDAPD_DB_PASSWD='' -export FAIL2BAN_DB_PASSWD='' -EOF