diff --git a/data/Dockerfiles/postfix/whitelist_forwardinghosts.sh b/data/Dockerfiles/postfix/whitelist_forwardinghosts.sh index 4ad5ab32..ab066d89 100755 --- a/data/Dockerfiles/postfix/whitelist_forwardinghosts.sh +++ b/data/Dockerfiles/postfix/whitelist_forwardinghosts.sh @@ -6,7 +6,7 @@ while read QUERY; do echo "500 dunno" continue fi - result=$(curl -s http://nginx:8081/forwardinghosts.php?host=${QUERY[1]}) + result=$(curl -s http://172.22.1.251:8081/forwardinghosts.php?host=${QUERY[1]}) logger -t whitelist_forwardinghosts -p mail.info "Look up ${QUERY[1]} on whitelist, result $result" echo ${result} done diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php index db3f2f38..a69e1f3e 100644 --- a/data/web/inc/init_db.inc.php +++ b/data/web/inc/init_db.inc.php @@ -237,51 +237,6 @@ function init_db_schema() { ), "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC" ), - "imap_user_shares" => array( - "cols" => array( - "from_user" => "VARCHAR(255) NOT NULL", - "to_user" => "VARCHAR(255) NOT NULL", - "dummy" => "CHAR(1) DEFAULT '1'", - "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)", - "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP" - ), - "keys" => array( - "primary" => array( - "" => array("from_user", "to_user") - ), - "fkey" => array( - "fk_from_user_user_shares" => array( - "col" => "from_user", - "ref" => "mailbox.username", - "delete" => "CASCADE", - "update" => "NO ACTION" - ) - ) - ), - "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC" - ), - "imap_anyone_shares" => array( - "cols" => array( - "from_user" => "VARCHAR(255) NOT NULL", - "dummy" => "CHAR(1) DEFAULT '1'", - "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)", - "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP" - ), - "keys" => array( - "primary" => array( - "" => array("from_user") - ), - "fkey" => array( - "fk_from_anyone_user_shares" => array( - "col" => "from_user", - "ref" => "mailbox.username", - "delete" => "CASCADE", - "update" => "NO ACTION" - ) - ) - ), - "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC" - ), "user_acl" => array( "cols" => array( "username" => "VARCHAR(255) NOT NULL", diff --git a/docker-compose.yml b/docker-compose.yml index d96d0a4f..e2cfab27 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '2.1' services: unbound-mailcow: - image: mailcow/unbound:1.0 + image: mailcow/unbound:1.1 build: ./data/Dockerfiles/unbound command: /usr/sbin/unbound volumes: @@ -47,7 +47,7 @@ services: - redis clamd-mailcow: - image: mailcow/clamd:1.5 + image: mailcow/clamd:1.6 build: ./data/Dockerfiles/clamd restart: always environment: @@ -60,7 +60,7 @@ services: - clamd rspamd-mailcow: - image: mailcow/rspamd:1.14 + image: mailcow/rspamd:1.15 build: ./data/Dockerfiles/rspamd stop_grace_period: 30s depends_on: @@ -83,7 +83,7 @@ services: - rspamd php-fpm-mailcow: - image: mailcow/phpfpm:1.5 + image: mailcow/phpfpm:1.6 build: ./data/Dockerfiles/phpfpm command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" depends_on: @@ -114,7 +114,7 @@ services: - phpfpm sogo-mailcow: - image: mailcow/sogo:1.10 + image: mailcow/sogo:1.11 build: ./data/Dockerfiles/sogo environment: - DBNAME=${DBNAME} @@ -134,7 +134,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.12 + image: mailcow/dovecot:1.13 build: ./data/Dockerfiles/dovecot cap_add: - NET_BIND_SERVICE @@ -170,7 +170,7 @@ services: - dovecot postfix-mailcow: - image: mailcow/postfix:1.8 + image: mailcow/postfix:1.9 build: ./data/Dockerfiles/postfix volumes: - ./data/conf/postfix:/opt/postfix/conf @@ -243,7 +243,7 @@ services: depends_on: - nginx-mailcow - mysql-mailcow - image: mailcow/acme:1.24 + image: mailcow/acme:1.25 build: ./data/Dockerfiles/acme dns: - 172.22.1.254 @@ -266,7 +266,7 @@ services: - acme fail2ban-mailcow: - image: mailcow/fail2ban:1.9 + image: mailcow/fail2ban:1.10 build: ./data/Dockerfiles/fail2ban stop_grace_period: 30s depends_on: @@ -287,7 +287,7 @@ services: - /lib/modules:/lib/modules:ro watchdog-mailcow: - image: mailcow/watchdog:1.10 + image: mailcow/watchdog:1.11 build: ./data/Dockerfiles/watchdog volumes: - vmail-vol-1:/vmail:ro @@ -306,7 +306,7 @@ services: - watchdog dockerapi-mailcow: - image: mailcow/dockerapi:1.2 + image: mailcow/dockerapi:1.3 restart: always build: ./data/Dockerfiles/dockerapi oom_score_adj: -10