Merge pull request #4698 from mailcow/staging

2022-07a

.github/workflows/close_old_issues_and_prs.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Mark/Close Stale Issues and Pull Requests 🗑️
-        uses: actions/stale@v5.0.0
+        uses: actions/stale@v5.1.0
         with:
           repo-token: ${{ secrets.STALE_ACTION_PAT }}
           days-before-stale: 60
@@ -30,6 +30,7 @@ jobs:
           stale-issue-label: "stale"
           stale-pr-label: "stale"
           exempt-draft-pr: "true"
+          close-issue-reason: "not_planned"
           operations-per-run: "250"
           ascending: "true"
           #DRY-RUN

.github/workflows/image_builds.yml

@@ -1,4 +1,4 @@
-name: Build Mailcow Docker Images
+name: Build mailcow Docker Images
 
 on:
   push:
@@ -9,19 +9,20 @@ jobs:
   docker_image_builds:
     strategy:
       matrix:
-        images: ["acme-mailcow",
+        images:
-                 "clamd-mailcow",
+          - "acme-mailcow"
-                 "dockerapi-mailcow",
+          - "clamd-mailcow"
-                 "dovecot-mailcow",
+          - "dockerapi-mailcow"
-                 "netfilter-mailcow",
+          - "dovecot-mailcow"
-                 "olefy-mailcow",
+          - "netfilter-mailcow"
-                 "php-fpm-mailcow",
+          - "olefy-mailcow"
-                 "postfix-mailcow",
+          - "php-fpm-mailcow"
-                 "rspamd-mailcow",
+          - "postfix-mailcow"
-                 "sogo-mailcow",
+          - "rspamd-mailcow"
-                 "solr-mailcow",
+          - "sogo-mailcow"
-                 "unbound-mailcow",
+          - "solr-mailcow"
-                 "watchdog-mailcow"]
+          - "unbound-mailcow"
+          - "watchdog-mailcow"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/integration_tests.yml

@@ -1,4 +1,4 @@
-name: Mailcow Integration Tests
+name: mailcow Integration Tests
 
 on:
   push:

.github/workflows/tweet-trigger-publish-release.yml

@@ -10,8 +10,8 @@ jobs:
       - name: Tweet-trigger-publish-release
         uses: mugi111/tweet-trigger-release@v1.1
         with:
-          consumer_key: ${{ secrets.TWITTER_CONSUMER_KEY }}
+          consumer_key: ${{ secrets.CONSUMER_KEY }}
-          consumer_secret: ${{ secrets.TWITTER_CONSUMER_SECRET }}
+          consumer_secret: ${{ secrets.CONSUMER_SECRET }}
-          access_token_key: ${{ secrets.TWITTER_ACCESS_TOKEN_KEY }}
+          access_token_key: ${{ secrets.ACCESS_TOKEN_KEY }}
-          access_token_secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
+          access_token_secret: ${{ secrets.ACCESS_TOKEN_SECRET }}
           tweet_body: 'A new mailcow-dockerized Release has been Released on GitHub! Checkout our GitHub Page for the latest Release: github.com/mailcow/mailcow-dockerized/releases/latest'

README.md

@@ -2,6 +2,7 @@
 
 ## We stand with 🇺🇦
 
+[![Mailcow Integration Tests](https://github.com/mailcow/mailcow-dockerized/actions/workflows/integration_tests.yml/badge.svg?branch=master)](https://github.com/mailcow/mailcow-dockerized/actions/workflows/integration_tests.yml)
 [![Translation status](https://translate.mailcow.email/widgets/mailcow-dockerized/-/translation/svg-badge.svg)](https://translate.mailcow.email/engage/mailcow-dockerized/)
 [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/mailcow_email.svg?style=social&label=Follow%20%40mailcow_email)](https://twitter.com/mailcow_email)
 

data/Dockerfiles/clamd/Dockerfile

@@ -1,4 +1,4 @@
-FROM clamav/clamav:0.105.0_base
+FROM clamav/clamav:0.105.1_base
 
 LABEL maintainer "André Peters <andre.peters@servercow.de>"
 

data/web/api/openapi.yaml

@@ -518,21 +518,23 @@ paths:
                         - domain.tld
                       type: success
               schema:
-                properties:
+                type: array
-                  log:
+                items:
-                    description: contains request object
+                  type: object
-                    items: {}
+                  properties:
-                    type: array
+                    log:
-                  msg:
+                      description: contains request object
-                    items: {}
+                      items: {}
-                    type: array
+                      type: array
-                  type:
+                    msg:
-                    enum:
+                      items: {}
-                      - success
+                      type: array
-                      - danger
+                    type:
-                      - error
+                      enum:
-                    type: string
+                        - success
-                type: object
+                        - danger
+                        - error
+                      type: string
           description: OK
           headers: {}
       tags:
@@ -579,6 +581,11 @@ paths:
                 domain:
                   description: Fully qualified domain name
                   type: string
+                gal:
+                  description: >-
+                    is domain global address list active or not, it enables
+                    shared contacts accross domain in SOGo webmail
+                  type: boolean
                 mailboxes:
                   description: limit count of mailboxes associated with this domain
                   type: number
@@ -596,6 +603,9 @@ paths:
                     if not, them you have to create "dummy" mailbox for each
                     address to relay
                   type: boolean
+                relay_unknown_only:
+                  description: Relay non-existing mailboxes only. Existing mailboxes will be delivered locally.
+                  type: boolean
                 rl_frame:
                   enum:
                     - s
@@ -606,6 +616,11 @@ paths:
                 rl_value:
                   description: rate limit value
                   type: number
+                tags:
+                  description: tags for this Domain
+                  type: array
+                  items:
+                    type: string
               type: object
       summary: Create domain
   /api/v1/add/domain-admin:
@@ -1952,21 +1967,23 @@ paths:
                         - domain2.tld
                       type: success
               schema:
-                properties:
+                type: array
-                  log:
+                items:
-                    description: contains request object
+                  type: object
-                    items: {}
+                  properties:
-                    type: array
+                    log:
-                  msg:
+                      description: contains request object
-                    items: {}
+                      items: {}
-                    type: array
+                      type: array
-                  type:
+                    msg:
-                    enum:
+                      items: {}
-                      - success
+                      type: array
-                      - danger
+                    type:
-                      - error
+                      enum:
-                    type: string
+                        - success
-                type: object
+                        - danger
+                        - error
+                      type: string
           description: OK
           headers: {}
       tags:
@@ -1977,14 +1994,15 @@ paths:
         content:
           application/json:
             schema:
+              type: object
               example:
                 - domain.tld
                 - domain2.tld
               properties:
                 items: 
-                  description: contains list of domains you want to delete
+                  type: array
-                  type: object
+                  items:
-              type: object
+                    type: string
       summary: Delete domain
   /api/v1/delete/domain-admin:
     post:
@@ -2972,23 +2990,25 @@ paths:
           $ref: "#/components/responses/Unauthorized"
         "200":
           content:
-            "*/*":
+            application/json:
               schema:
-                properties:
+                type: array
-                  log:
+                items: 
-                    description: contains request object
+                  type: object
-                    items: {}
+                  properties:
-                    type: array
+                    log:
-                  msg:
+                      type: array
-                    items: {}
+                      description: contains request object
-                    type: array
+                      items: {}
-                  type:
+                    msg:
-                    enum:
+                      type: array
-                      - success
+                      items: {}
-                      - danger
+                    type:
-                      - error
+                      enum:
-                    type: string
+                        - success
-                type: object
+                        - danger
+                        - error
+                      type: string
           description: OK
           headers: {}
       tags:
@@ -3056,13 +3076,33 @@ paths:
                         if not, them you have to create "dummy" mailbox for each
                         address to relay
                       type: boolean
+                    relay_unknown_only:
+                      description: Relay non-existing mailboxes only. Existing mailboxes will be delivered locally.
+                      type: boolean
                     relayhost:
                       description: id of relayhost
                       type: number
+                    rl_frame:
+                      enum:
+                        - s
+                        - m
+                        - h
+                        - d
+                      type: string
+                    rl_value:
+                      description: rate limit value
+                      type: number
+                    tags:
+                      description: tags for this Domain
+                      type: array
+                      items:
+                        type: string
                   type: object
                 items:
                   description: contains list of domain names you want update
-                  type: object
+                  type: array
+                  items:
+                    type: string
               type: object
       summary: Update domain
   /api/v1/edit/fail2ban:

data/web/inc/init_db.inc.php

@@ -3,7 +3,7 @@ function init_db_schema() {
   try {
     global $pdo;
 
-    $db_version = "13072022_1700";
+    $db_version = "25072022_2300";
 
     $stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
     $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
@@ -738,7 +738,7 @@ function init_db_schema() {
           "username" => "VARCHAR(255) NOT NULL",
           "authmech" => "ENUM('yubi_otp', 'u2f', 'hotp', 'totp', 'webauthn')",
           "secret" => "VARCHAR(255) DEFAULT NULL",
-          "keyHandle" => "VARCHAR(255) DEFAULT NULL",
+          "keyHandle" => "VARCHAR(1023) DEFAULT NULL",
           "publicKey" => "VARCHAR(4096) DEFAULT NULL",
           "counter" => "INT NOT NULL DEFAULT '0'",
           "certificate" => "TEXT",

docker-compose.yml

@@ -58,7 +58,7 @@ services:
             - redis
 
     clamd-mailcow:
-      image: mailcow/clamd:1.53
+      image: mailcow/clamd:1.54
       restart: always
       depends_on:
         - unbound-mailcow

update.sh

@@ -203,7 +203,7 @@ else
     DC_DL_SUFFIX=legacy
   fi
   sleep 1
-  if [[ $(which pip 2>&1) && $(pip list --local 2>&1 | grep -v DEPRECATION | grep -c docker-compose) == 1 || $(which pip3 2>&1) && $(pip3 list --local 2>&1 | grep -v DEPRECATION | grep -c docker-compose) == 1 ]]; then
+  if [[ $(command -v pip 2>&1) && $(pip list --local 2>&1 | grep -v DEPRECATION | grep -c docker-compose) == 1 || $(command -v pip3 2>&1) && $(pip3 list --local 2>&1 | grep -v DEPRECATION | grep -c docker-compose) == 1 ]]; then
     echo -e "\e[33mFound a docker-compose Version installed with pip!\e[0m"
     echo -e "\e[31mPlease uninstall the pip Version of docker-compose since it doesn´t support Versions higher than 1.29.2.\e[0m"
     sleep 2
@@ -214,7 +214,7 @@ else
     LATEST_COMPOSE=$(curl -#L https://www.servercow.de/docker-compose/latest.php)
     COMPOSE_VERSION=$(docker-compose version --short)
     if [[ "$LATEST_COMPOSE" != "$COMPOSE_VERSION" ]]; then
-      COMPOSE_PATH=$(which docker-compose)
+      COMPOSE_PATH=$(command -v docker-compose)
       if [[ -w ${COMPOSE_PATH} ]]; then
         curl -#L https://github.com/docker/compose/releases/download/v${LATEST_COMPOSE}/docker-compose-$(uname -s)-$(uname -m) > $COMPOSE_PATH
         chmod +x $COMPOSE_PATH
@@ -273,30 +273,17 @@ PATH=$PATH:/opt/bin
 umask 0022
 
 for bin in curl docker git awk sha1sum; do
-  if [[ -z $(which ${bin}) ]]; then 
+  if [[ -z $(command -v ${bin}) ]]; then 
   echo "Cannot find ${bin}, exiting..." 
   exit 1;
-  elif [[ -z $(which docker-compose) ]]; then
-  echo -e "\e[31mCannot find docker-compose Standalone.\e[0m" 
-  echo -e "\e[31mPlease install it manually regarding to this doc site: https://mailcow.github.io/mailcow-dockerized-docs/i_u_m/i_u_m_install/\e[0m"
-  sleep 3
-  exit 1;
   fi  
 done
 
-## Check if docker-compose >= v2
+if [[ -z $(command -v docker-compose) ]]; then
-if ! docker-compose version --short | grep "^2." > /dev/null 2>&1; then
+  echo -e "\e[31mCannot find docker-compose Standalone.\e[0m" 
-  echo -e "\e[33mYour docker-compose Version is not up to date!\e[0m"
+  echo -e "\e[31mPlease install it manually regarding to this doc site: https://mailcow.github.io/mailcow-dockerized-docs/i_u_m/i_u_m_install/\e[0m"
-  echo -e "\e[33mmailcow needs docker-compose > 2.X.X!\e[0m"
-  echo -e "\e[33mYour current installed Version: $(docker-compose version --short)\e[0m"
   sleep 3
-  update_compose
+  exit 1;
-  if [[ ! "${updatecomposeresponse}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
-     echo -e "\e[31mmailcow does not work with docker-compose < 2.X.X anymore!\e[0m"
-     echo -e "\e[31mPlease update your docker-compose manually, to run mailcow.\e[0m"
-     echo -e "\e[31mExiting...\e[0m"
-     exit 1
-  fi    
 fi
 
 export LC_ALL=C
@@ -378,6 +365,21 @@ while (($#)); do
   shift
 done
 
+# Check if Docker-Compose is older then v2 before continuing
+if ! docker-compose version --short | grep "^2." > /dev/null 2>&1; then
+  echo -e "\e[33mYour docker-compose Version is not up to date!\e[0m"
+  echo -e "\e[33mmailcow needs docker-compose > 2.X.X!\e[0m"
+  echo -e "\e[33mYour current installed Version: $(docker-compose version --short)\e[0m"
+  sleep 3
+  update_compose
+  if [[ ! "${updatecomposeresponse}" =~ ^([yY][eE][sS]|[yY])+$ ]] && [[ ! ${FORCE} ]]; then
+     echo -e "\e[31mmailcow does not work with docker-compose < 2.X.X anymore!\e[0m"
+     echo -e "\e[31mPlease update your docker-compose manually, to run mailcow.\e[0m"
+     echo -e "\e[31mExiting...\e[0m"
+     exit 1
+  fi
+fi
+
 [[ ! -f mailcow.conf ]] && { echo "mailcow.conf is missing"; exit 1;}
 chmod 600 mailcow.conf
 source mailcow.conf