Skip to content

Commit b51a659

Browse files
DerLinkmanDerLinkman
authored
Merge pull request #4698 from mailcow/staging
2022-07a
2 parents b6e3e7a + 44a6f09 commit b51a659

File tree

7 files changed

+113
-71
lines changed

7 files changed

+113
-71
lines changed

‎.github/workflows/close_old_issues_and_prs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write
1515
steps:
1616
- name: Mark/Close Stale Issues and Pull Requests 🗑️
17-
uses: actions/stale@v5.0.0
17+
uses: actions/stale@v5.1.0
1818
with:
1919
repo-token: ${{ secrets.STALE_ACTION_PAT }}
2020
days-before-stale: 60
@@ -30,6 +30,7 @@ jobs:
3030
stale-issue-label: "stale"
3131
stale-pr-label: "stale"
3232
exempt-draft-pr: "true"
33+
close-issue-reason: "not_planned"
3334
operations-per-run: "250"
3435
ascending: "true"
3536
#DRY-RUN

‎.github/workflows/image_builds.yml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Mailcow Docker Images
1+
name: Build mailcow Docker Images
22

33
on:
44
push:
@@ -9,19 +9,20 @@ jobs:
99
docker_image_builds:
1010
strategy:
1111
matrix:
12-
images: ["acme-mailcow",
13-
"clamd-mailcow",
14-
"dockerapi-mailcow",
15-
"dovecot-mailcow",
16-
"netfilter-mailcow",
17-
"olefy-mailcow",
18-
"php-fpm-mailcow",
19-
"postfix-mailcow",
20-
"rspamd-mailcow",
21-
"sogo-mailcow",
22-
"solr-mailcow",
23-
"unbound-mailcow",
24-
"watchdog-mailcow"]
12+
images:
13+
- "acme-mailcow"
14+
- "clamd-mailcow"
15+
- "dockerapi-mailcow"
16+
- "dovecot-mailcow"
17+
- "netfilter-mailcow"
18+
- "olefy-mailcow"
19+
- "php-fpm-mailcow"
20+
- "postfix-mailcow"
21+
- "rspamd-mailcow"
22+
- "sogo-mailcow"
23+
- "solr-mailcow"
24+
- "unbound-mailcow"
25+
- "watchdog-mailcow"
2526
runs-on: ubuntu-latest
2627
steps:
2728
- uses: actions/checkout@v3

‎.github/workflows/integration_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Mailcow Integration Tests
1+
name: mailcow Integration Tests
22

33
on:
44
push:

‎data/Dockerfiles/clamd/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM clamav/clamav:0.105.0_base
1+
FROM clamav/clamav:0.105.1_base
22

33
LABEL maintainer "André Peters <[email protected]>"
44

‎data/web/api/openapi.yaml‎

Lines changed: 91 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -518,21 +518,23 @@ paths:
518518
- domain.tld
519519
type: success
520520
schema:
521-
properties:
522-
log:
523-
description: contains request object
524-
items: {}
525-
type: array
526-
msg:
527-
items: {}
528-
type: array
529-
type:
530-
enum:
531-
- success
532-
- danger
533-
- error
534-
type: string
535-
type: object
521+
type: array
522+
items:
523+
type: object
524+
properties:
525+
log:
526+
description: contains request object
527+
items: {}
528+
type: array
529+
msg:
530+
items: {}
531+
type: array
532+
type:
533+
enum:
534+
- success
535+
- danger
536+
- error
537+
type: string
536538
description: OK
537539
headers: {}
538540
tags:
@@ -579,6 +581,11 @@ paths:
579581
domain:
580582
description: Fully qualified domain name
581583
type: string
584+
gal:
585+
description: >-
586+
is domain global address list active or not, it enables
587+
shared contacts accross domain in SOGo webmail
588+
type: boolean
582589
mailboxes:
583590
description: limit count of mailboxes associated with this domain
584591
type: number
@@ -596,6 +603,9 @@ paths:
596603
if not, them you have to create "dummy" mailbox for each
597604
address to relay
598605
type: boolean
606+
relay_unknown_only:
607+
description: Relay non-existing mailboxes only. Existing mailboxes will be delivered locally.
608+
type: boolean
599609
rl_frame:
600610
enum:
601611
- s
@@ -606,6 +616,11 @@ paths:
606616
rl_value:
607617
description: rate limit value
608618
type: number
619+
tags:
620+
description: tags for this Domain
621+
type: array
622+
items:
623+
type: string
609624
type: object
610625
summary: Create domain
611626
/api/v1/add/domain-admin:
@@ -1952,21 +1967,23 @@ paths:
19521967
- domain2.tld
19531968
type: success
19541969
schema:
1955-
properties:
1956-
log:
1957-
description: contains request object
1958-
items: {}
1959-
type: array
1960-
msg:
1961-
items: {}
1962-
type: array
1963-
type:
1964-
enum:
1965-
- success
1966-
- danger
1967-
- error
1968-
type: string
1969-
type: object
1970+
type: array
1971+
items:
1972+
type: object
1973+
properties:
1974+
log:
1975+
description: contains request object
1976+
items: {}
1977+
type: array
1978+
msg:
1979+
items: {}
1980+
type: array
1981+
type:
1982+
enum:
1983+
- success
1984+
- danger
1985+
- error
1986+
type: string
19701987
description: OK
19711988
headers: {}
19721989
tags:
@@ -1977,14 +1994,15 @@ paths:
19771994
content:
19781995
application/json:
19791996
schema:
1997+
type: object
19801998
example:
19811999
- domain.tld
19822000
- domain2.tld
19832001
properties:
1984-
items:
1985-
description: contains list of domains you want to delete
1986-
type: object
1987-
type: object
2002+
items:
2003+
type: array
2004+
items:
2005+
type: string
19882006
summary: Delete domain
19892007
/api/v1/delete/domain-admin:
19902008
post:
@@ -2972,23 +2990,25 @@ paths:
29722990
$ref: "#/components/responses/Unauthorized"
29732991
"200":
29742992
content:
2975-
"*/*":
2993+
application/json:
29762994
schema:
2977-
properties:
2978-
log:
2979-
description: contains request object
2980-
items: {}
2981-
type: array
2982-
msg:
2983-
items: {}
2984-
type: array
2985-
type:
2986-
enum:
2987-
- success
2988-
- danger
2989-
- error
2990-
type: string
2991-
type: object
2995+
type: array
2996+
items:
2997+
type: object
2998+
properties:
2999+
log:
3000+
type: array
3001+
description: contains request object
3002+
items: {}
3003+
msg:
3004+
type: array
3005+
items: {}
3006+
type:
3007+
enum:
3008+
- success
3009+
- danger
3010+
- error
3011+
type: string
29923012
description: OK
29933013
headers: {}
29943014
tags:
@@ -3056,13 +3076,33 @@ paths:
30563076
if not, them you have to create "dummy" mailbox for each
30573077
address to relay
30583078
type: boolean
3079+
relay_unknown_only:
3080+
description: Relay non-existing mailboxes only. Existing mailboxes will be delivered locally.
3081+
type: boolean
30593082
relayhost:
30603083
description: id of relayhost
30613084
type: number
3085+
rl_frame:
3086+
enum:
3087+
- s
3088+
- m
3089+
- h
3090+
- d
3091+
type: string
3092+
rl_value:
3093+
description: rate limit value
3094+
type: number
3095+
tags:
3096+
description: tags for this Domain
3097+
type: array
3098+
items:
3099+
type: string
30623100
type: object
30633101
items:
30643102
description: contains list of domain names you want update
3065-
type: object
3103+
type: array
3104+
items:
3105+
type: string
30663106
type: object
30673107
summary: Update domain
30683108
/api/v1/edit/fail2ban:

‎data/web/inc/init_db.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ function init_db_schema() {
33
try {
44
global $pdo;
55

6-
$db_version = "13072022_1700";
6+
$db_version = "25072022_2300";
77

88
$stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
99
$num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
@@ -738,7 +738,7 @@ function init_db_schema() {
738738
"username" => "VARCHAR(255) NOT NULL",
739739
"authmech" => "ENUM('yubi_otp', 'u2f', 'hotp', 'totp', 'webauthn')",
740740
"secret" => "VARCHAR(255) DEFAULT NULL",
741-
"keyHandle" => "VARCHAR(255) DEFAULT NULL",
741+
"keyHandle" => "VARCHAR(1023) DEFAULT NULL",
742742
"publicKey" => "VARCHAR(4096) DEFAULT NULL",
743743
"counter" => "INT NOT NULL DEFAULT '0'",
744744
"certificate" => "TEXT",

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ services:
5858
- redis
5959

6060
clamd-mailcow:
61-
image: mailcow/clamd:1.53
61+
image: mailcow/clamd:1.54
6262
restart: always
6363
depends_on:
6464
- unbound-mailcow

0 commit comments

Comments
 (0)