From bdd8b4a5abe4f142c0e2a6a3ba12e19730538884 Mon Sep 17 00:00:00 2001
From: FreddleSpl0it <75116288+FreddleSpl0it@users.noreply.github.com>
Date: Sat, 5 Mar 2022 23:27:36 +0100
Subject: [PATCH 1/2] [Web] Footer fix (#4500)

* Fix issue forms

* [GH-Actions][stale] Update to v5.0.0

* [Web] fix version footer

* [Web] fix footer - hard coded repo url

Co-authored-by: Peter <magic@kthx.at>
---
 data/web/css/build/008-mailcow.css | 2 --
 generate_config.sh                 | 3 +--
 update.sh                          | 3 +--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/data/web/css/build/008-mailcow.css b/data/web/css/build/008-mailcow.css
index 4d45a75e..d7533424 100644
--- a/data/web/css/build/008-mailcow.css
+++ b/data/web/css/build/008-mailcow.css
@@ -204,8 +204,6 @@ legend {
   color: #959595;
   display: flex;
   flex-direction: column;
-  width: 100% !important;
-  padding: 0 !important;
 }
 .footer .version {
     margin-left: auto;
diff --git a/generate_config.sh b/generate_config.sh
index 6bef72ea..f2f444c5 100755
--- a/generate_config.sh
+++ b/generate_config.sh
@@ -365,10 +365,9 @@ cp -n -d data/assets/ssl-example/*.pem data/assets/ssl/
 # Set app_info.inc.php
 mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`)
 if [ $? -eq 0 ]; then
-  mailcow_git_url=$(git config --get remote.origin.url)
   echo '<?php' > data/web/inc/app_info.inc.php
   echo '  $MAILCOW_GIT_VERSION="'$mailcow_git_version'";' >> data/web/inc/app_info.inc.php
-  echo '  $MAILCOW_GIT_URL="'$mailcow_git_url'";' >> data/web/inc/app_info.inc.php
+  echo '  $MAILCOW_GIT_URL="https://github.com/mailcow/mailcow-dockerized";' >> data/web/inc/app_info.inc.php
   echo '?>' >> data/web/inc/app_info.inc.php
 else
   echo '<?php' > data/web/inc/app_info.inc.php
diff --git a/update.sh b/update.sh
index 033aa140..2f336428 100755
--- a/update.sh
+++ b/update.sh
@@ -722,10 +722,9 @@ fi
 # Set app_info.inc.php
 mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`)
 if [ $? -eq 0 ]; then
-  mailcow_git_url=$(git config --get remote.origin.url)
   echo '<?php' > data/web/inc/app_info.inc.php
   echo '  $MAILCOW_GIT_VERSION="'$mailcow_git_version'";' >> data/web/inc/app_info.inc.php
-  echo '  $MAILCOW_GIT_URL="'$mailcow_git_url'";' >> data/web/inc/app_info.inc.php
+  echo '  $MAILCOW_GIT_URL="https://github.com/mailcow/mailcow-dockerized";' >> data/web/inc/app_info.inc.php
   echo '?>' >> data/web/inc/app_info.inc.php
 else
   echo '<?php' > data/web/inc/app_info.inc.php

From eddaf7a9752592b5d9daae8cec79047d0b714901 Mon Sep 17 00:00:00 2001
From: Peter <magic@kthx.at>
Date: Sat, 5 Mar 2022 23:31:41 +0100
Subject: [PATCH 2/2] Revert "Before update on 2022-03-02_17_04_05"

This reverts commit 24275ffdbf6facaf38ae77a3094363b8e0a01f33.
---
 data/conf/postfix/main.cf |  3 ---
 docker-compose.yml        | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf
index 62c91191..a445b60c 100644
--- a/data/conf/postfix/main.cf
+++ b/data/conf/postfix/main.cf
@@ -198,6 +198,3 @@ parent_domain_matches_subdomains = debug_peer_list,fast_flush_domains,mynetworks
 
 # DO NOT EDIT ANYTHING BELOW #
 # User overrides #
-
-myhostname = mx.mailcow.email
-
diff --git a/docker-compose.yml b/docker-compose.yml
index a4ae8454..74b01aca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -577,6 +577,36 @@ services:
           aliases:
             - ofelia
 
+    ipv6nat-mailcow:
+      depends_on:
+        - unbound-mailcow
+        - mysql-mailcow
+        - redis-mailcow
+        - clamd-mailcow
+        - rspamd-mailcow
+        - php-fpm-mailcow
+        - sogo-mailcow
+        - dovecot-mailcow
+        - postfix-mailcow
+        - memcached-mailcow
+        - nginx-mailcow
+        - acme-mailcow
+        - netfilter-mailcow
+        - watchdog-mailcow
+        - dockerapi-mailcow
+        - solr-mailcow
+      environment:
+        - TZ=${TZ}
+      image: robbertkl/ipv6nat
+      security_opt:
+        - label=disable
+      restart: always
+      privileged: true
+      network_mode: "host"
+      volumes:
+        - /var/run/docker.sock:/var/run/docker.sock:ro
+        - /lib/modules:/lib/modules:ro
+
 networks:
   mailcow-network:
     driver: bridge