Mailcow: Update.
Change-Id: I47c7c6e462fa69513ba6b7c33bfa23665426b257
diff --git a/mailcow/default.nix b/mailcow/default.nix
index 05a0b1d..0408755 100644
--- a/mailcow/default.nix
+++ b/mailcow/default.nix
@@ -1,6 +1,15 @@
{ system ? builtins.currentSystem }:
let
- pkgs = import <nixpkgs> { inherit system; };
+ pkgs = import <nixpkgs> {
+ inherit system;
+ overlays = [
+ (self: super: {
+ docker = super.docker.override {
+ iptables = self.iptables-legacy;
+ };
+ })
+ ];
+ };
in
let
@@ -67,6 +76,7 @@
${pkgs.docker-compose}/bin/docker-compose -f /mailcow-dockerized/docker-compose.yml -f ${dockerComposeOverrideYaml}/docker-compose.override.yml build
${pkgs.busybox}/bin/mkdir -p /tmp /run/{mysql,mysql-socket}
+ ${pkgs.busybox}/bin/chmod u+w /mailcow-dockerized/data/web/templates/cache
exec ${pkgs.docker-compose}/bin/docker-compose --env-file /mailcow-dockerized/mailcow.conf -f /mailcow-dockerized/docker-compose.yml -f ${dockerComposeOverrideYaml}/docker-compose.override.yml up --remove-orphans
'';
diff --git a/mailcow/src/mailcow-dockerized/data/Dockerfiles/dockerapi/dockerapi.py b/mailcow/src/mailcow-dockerized/data/Dockerfiles/dockerapi/dockerapi.py
index 34f9b06..4a17e0c 100644
--- a/mailcow/src/mailcow-dockerized/data/Dockerfiles/dockerapi/dockerapi.py
+++ b/mailcow/src/mailcow-dockerized/data/Dockerfiles/dockerapi/dockerapi.py
@@ -375,12 +375,14 @@
# api call: container_post - post_action: exec - cmd: system - task: mysql_upgrade
- def container_post__exec__system__mysql_upgrade(self, container_id):
- return jsonify(type='success', msg='mysql_upgrade: not touching fake MySQL', text='')
+ async def container_post__exec__system__mysql_upgrade(self, container_id, request_json):
+ return Response(content=json.dumps(dict(type='success', msg='mysql_upgrade: not touching fake MySQL', text=''), indent=4), media_type="application/json")
+
# api call: container_post - post_action: exec - cmd: system - task: mysql_tzinfo_to_sql
- def container_post__exec__system__mysql_tzinfo_to_sql(self, container_id):
- return jsonify(type='success', msg='mysql_tzinfo_to_sql: not touching fake MySQL', text='')
+ async def container_post__exec__system__mysql_tzinfo_to_sql(self, container_id, request_json):
+ return Response(content=json.dumps(dict(type='success', msg='mysql_tzinfo_to_sql: not touching fake MySQL', text=''), indent=4), media_type="application/json")
+
# api call: container_post - post_action: exec - cmd: reload - task: dovecot
async def container_post__exec__reload__dovecot(self, container_id, request_json):
diff --git a/mailcow/src/mailcow-dockerized/docker-compose.yml b/mailcow/src/mailcow-dockerized/docker-compose.yml
index 0361b85..beaac7a 100644
--- a/mailcow/src/mailcow-dockerized/docker-compose.yml
+++ b/mailcow/src/mailcow-dockerized/docker-compose.yml
@@ -378,8 +378,8 @@
- ./data/conf/rspamd/meta_exporter:/meta_exporter:ro,z
- sogo-web-vol-1:/usr/lib/GNUstep/SOGo/
ports:
- - "${HTTPS_BIND:-}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
- - "${HTTP_BIND:-}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
+ - 80:80
+ - 443:443
restart: always
networks:
mailcow-network: