From 4bef1ba80560b44e1bbbbe9e835a1afe7be17226 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin+github@philipp.info>
Date: Tue, 25 Feb 2020 23:03:15 +0100
Subject: [PATCH] Replace HOSTNAME environment variable with SMTP_DOMAIN (fixes
 https://github.com/friendica/docker/issues/79 )

---
 2019.12/apache/config/zz-docker.config.php         | 4 ----
 2019.12/fpm-alpine/config/zz-docker.config.php     | 4 ----
 2019.12/fpm/config/zz-docker.config.php            | 4 ----
 2020.03-dev/apache/config/zz-docker.config.php     | 4 ----
 2020.03-dev/fpm-alpine/config/zz-docker.config.php | 4 ----
 2020.03-dev/fpm/config/zz-docker.config.php        | 4 ----
 6 files changed, 24 deletions(-)

diff --git a/2019.12/apache/config/zz-docker.config.php b/2019.12/apache/config/zz-docker.config.php
index 576f523..2d5835d 100644
--- a/2019.12/apache/config/zz-docker.config.php
+++ b/2019.12/apache/config/zz-docker.config.php
@@ -59,8 +59,4 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
-if (!empty(getenv('HOSTNAME'))) {
-	$config['config']['hostname'] = getenv('HOSTNAME');
-}
-
 return $config;
diff --git a/2019.12/fpm-alpine/config/zz-docker.config.php b/2019.12/fpm-alpine/config/zz-docker.config.php
index 576f523..2d5835d 100644
--- a/2019.12/fpm-alpine/config/zz-docker.config.php
+++ b/2019.12/fpm-alpine/config/zz-docker.config.php
@@ -59,8 +59,4 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
-if (!empty(getenv('HOSTNAME'))) {
-	$config['config']['hostname'] = getenv('HOSTNAME');
-}
-
 return $config;
diff --git a/2019.12/fpm/config/zz-docker.config.php b/2019.12/fpm/config/zz-docker.config.php
index 576f523..2d5835d 100644
--- a/2019.12/fpm/config/zz-docker.config.php
+++ b/2019.12/fpm/config/zz-docker.config.php
@@ -59,8 +59,4 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
-if (!empty(getenv('HOSTNAME'))) {
-	$config['config']['hostname'] = getenv('HOSTNAME');
-}
-
 return $config;
diff --git a/2020.03-dev/apache/config/zz-docker.config.php b/2020.03-dev/apache/config/zz-docker.config.php
index 576f523..2d5835d 100644
--- a/2020.03-dev/apache/config/zz-docker.config.php
+++ b/2020.03-dev/apache/config/zz-docker.config.php
@@ -59,8 +59,4 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
-if (!empty(getenv('HOSTNAME'))) {
-	$config['config']['hostname'] = getenv('HOSTNAME');
-}
-
 return $config;
diff --git a/2020.03-dev/fpm-alpine/config/zz-docker.config.php b/2020.03-dev/fpm-alpine/config/zz-docker.config.php
index 576f523..2d5835d 100644
--- a/2020.03-dev/fpm-alpine/config/zz-docker.config.php
+++ b/2020.03-dev/fpm-alpine/config/zz-docker.config.php
@@ -59,8 +59,4 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
-if (!empty(getenv('HOSTNAME'))) {
-	$config['config']['hostname'] = getenv('HOSTNAME');
-}
-
 return $config;
diff --git a/2020.03-dev/fpm/config/zz-docker.config.php b/2020.03-dev/fpm/config/zz-docker.config.php
index 576f523..2d5835d 100644
--- a/2020.03-dev/fpm/config/zz-docker.config.php
+++ b/2020.03-dev/fpm/config/zz-docker.config.php
@@ -59,8 +59,4 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
-if (!empty(getenv('HOSTNAME'))) {
-	$config['config']['hostname'] = getenv('HOSTNAME');
-}
-
 return $config;