Add smtp_server and smtp_port as configuration variables (#22)

* Add smtp_server and smtp_port as configuration variables * Add a default value to smtp_server and smtp_port Update Readme
postfixadmin · Mar 8, 2020 · 4791374 · 4791374
1 parent 9419925
commit 4791374
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -51,6 +51,11 @@ You can configure this through the following environment variables when running
 
 Note: An SQLite database is probably not recommended for production use, but is a quick and easy way to try out the software without dependencies. 
 
+You can also set the postfix host and port.
+
+ * POSTFIXADMIN\_SMTP\_SERVER=... - localhost per default
+ * POSTFIXADMIN\_SMTP\_PORT=...   - 25 per default
+
 ### Example docker run
 
 ```bash
@@ -59,6 +64,8 @@ docker run -e POSTFIXADMIN_DB_TYPE=mysqli \
            -e POSTFIXADMIN_DB_USER=user \
            -e POSTFIXADMIN_DB_PASSWORD=topsecret \
            -e POSTFIXADMIN_DB_NAME=postfixadmin \
+           -e POSTFIXADMIN_SMTP_SERVER=postfix \
+           -e POSTFIXADMIN_SMTP_PORT=25 \
            --name postfixadmin \
            -p 8080:80 \
         postfixadmin-image
@@ -119,6 +126,8 @@ services:
        POSTFIXADMIN_DB_USER: postfixadmin
        POSTFIXADMIN_DB_NAME: postfixadmin
        POSTFIXADMIN_DB_PASSWORD: postfixadminPassword
+       POSTFIXADMIN_SMTP_SERVER: postfix
+       POSTFIXADMIN_SMTP_PORT: 25
 
 ```
 
diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
@@ -5,6 +5,8 @@ POSTFIXADMIN_DB_TYPE=${POSTFIXADMIN_DB_TYPE:=sqlite}
 POSTFIXADMIN_DB_HOST=${POSTFIXADMIN_DB_HOST:=""}
 POSTFIXADMIN_DB_USER=${POSTFIXADMIN_DB_USER:=""}
 POSTFIXADMIN_DB_PASSWORD=${POSTFIXADMIN_DB_PASSWORD:=""}
+POSTFIXADMIN_SMTP_SERVER=${POSTFIXADMIN_SMTP_SERVER:="localhost"}
+POSTFIXADMIN_SMTP_PORT=${POSTFIXADMIN_SMTP_PORT:="25"}
 
 # topsecret99
 DEFAULT_SETUP_PASSWORD="791eb4ead7fd996c01bed30707ae27dd:b7910d09773104bf84c4f4951205d2198c7cfc4f"
@@ -72,6 +74,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
 		\$CONF['database_password'] = '${POSTFIXADMIN_DB_PASSWORD}';
 		\$CONF['database_name'] = '${POSTFIXADMIN_DB_NAME}';
 		\$CONF['setup_password'] = '${POSTFIXADMIN_SETUP_PASSWORD}';
+		\$CONF['smtp_server'] = '${POSTFIXADMIN_SMTP_SERVER}';
+		\$CONF['smtp_port'] = '${POSTFIXADMIN_SMTP_PORT}';
 		\$CONF['configured'] = true;
 		?>" | tee config.local.php
 	else

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -5,6 +5,8 @@ POSTFIXADMIN_DB_TYPE=${POSTFIXADMIN_DB_TYPE:=sqlite}
 POSTFIXADMIN_DB_HOST=${POSTFIXADMIN_DB_HOST:=""}
 POSTFIXADMIN_DB_USER=${POSTFIXADMIN_DB_USER:=""}
 POSTFIXADMIN_DB_PASSWORD=${POSTFIXADMIN_DB_PASSWORD:=""}
+POSTFIXADMIN_SMTP_SERVER=${POSTFIXADMIN_SMTP_SERVER:="localhost"}
+POSTFIXADMIN_SMTP_PORT=${POSTFIXADMIN_SMTP_PORT:="25"}
 
 # topsecret99
 DEFAULT_SETUP_PASSWORD="791eb4ead7fd996c01bed30707ae27dd:b7910d09773104bf84c4f4951205d2198c7cfc4f"
@@ -72,6 +74,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
 		\$CONF['database_password'] = '${POSTFIXADMIN_DB_PASSWORD}';
 		\$CONF['database_name'] = '${POSTFIXADMIN_DB_NAME}';
 		\$CONF['setup_password'] = '${POSTFIXADMIN_SETUP_PASSWORD}';
+		\$CONF['smtp_server'] = '${POSTFIXADMIN_SMTP_SERVER}';
+		\$CONF['smtp_port'] = '${POSTFIXADMIN_SMTP_PORT}';
 		\$CONF['configured'] = true;
 		?>" | tee config.local.php
 	else

diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
@@ -5,6 +5,8 @@ POSTFIXADMIN_DB_TYPE=${POSTFIXADMIN_DB_TYPE:=sqlite}
 POSTFIXADMIN_DB_HOST=${POSTFIXADMIN_DB_HOST:=""}
 POSTFIXADMIN_DB_USER=${POSTFIXADMIN_DB_USER:=""}
 POSTFIXADMIN_DB_PASSWORD=${POSTFIXADMIN_DB_PASSWORD:=""}
+POSTFIXADMIN_SMTP_SERVER=${POSTFIXADMIN_SMTP_SERVER:="localhost"}
+POSTFIXADMIN_SMTP_PORT=${POSTFIXADMIN_SMTP_PORT:="25"}
 
 # topsecret99
 DEFAULT_SETUP_PASSWORD="791eb4ead7fd996c01bed30707ae27dd:b7910d09773104bf84c4f4951205d2198c7cfc4f"
@@ -72,6 +74,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
 		\$CONF['database_password'] = '${POSTFIXADMIN_DB_PASSWORD}';
 		\$CONF['database_name'] = '${POSTFIXADMIN_DB_NAME}';
 		\$CONF['setup_password'] = '${POSTFIXADMIN_SETUP_PASSWORD}';
+		\$CONF['smtp_server'] = '${POSTFIXADMIN_SMTP_SERVER}';
+		\$CONF['smtp_port'] = '${POSTFIXADMIN_SMTP_PORT}';
 		\$CONF['configured'] = true;
 		?>" | tee config.local.php
 	else

diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
@@ -5,6 +5,8 @@ POSTFIXADMIN_DB_TYPE=${POSTFIXADMIN_DB_TYPE:=sqlite}
 POSTFIXADMIN_DB_HOST=${POSTFIXADMIN_DB_HOST:=""}
 POSTFIXADMIN_DB_USER=${POSTFIXADMIN_DB_USER:=""}
 POSTFIXADMIN_DB_PASSWORD=${POSTFIXADMIN_DB_PASSWORD:=""}
+POSTFIXADMIN_SMTP_SERVER=${POSTFIXADMIN_SMTP_SERVER:="localhost"}
+POSTFIXADMIN_SMTP_PORT=${POSTFIXADMIN_SMTP_PORT:="25"}
 
 # topsecret99
 DEFAULT_SETUP_PASSWORD="791eb4ead7fd996c01bed30707ae27dd:b7910d09773104bf84c4f4951205d2198c7cfc4f"
@@ -72,6 +74,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
 		\$CONF['database_password'] = '${POSTFIXADMIN_DB_PASSWORD}';
 		\$CONF['database_name'] = '${POSTFIXADMIN_DB_NAME}';
 		\$CONF['setup_password'] = '${POSTFIXADMIN_SETUP_PASSWORD}';
+		\$CONF['smtp_server'] = '${POSTFIXADMIN_SMTP_SERVER}';
+		\$CONF['smtp_port'] = '${POSTFIXADMIN_SMTP_PORT}';
 		\$CONF['configured'] = true;
 		?>" | tee config.local.php
 	else