refractor variable replacement

dovecot/Dockerfile

@@ -26,6 +26,10 @@ RUN rm -rf /var/log/* &&\
 
 COPY ./sieve/ /etc/dovecot/sieve/
 
+COPY ./vars-vars /etc/vars-vars
+
+COPY ./vars-files /etc/vars-files
+
 COPY ./run.sh /run.sh
 
 VOLUME ["/var/email"]

dovecot/config/dovecot-pgsql.conf

@@ -1,5 +1,5 @@
 driver = pgsql
-connect = host=localhost dbname=postfixadmin user=postfixadmin password=fNzBE6acH5ZNLuLc
+connect = host=POSTGRES_HOST dbname=POSTGRES_DB user=POSTGRES_USER password=POSTGRES_PASSWORD
 default_pass_scheme = MD5-CRYPT
 user_query = SELECT '/var/email/%d/%n' as home, 7788 AS uid, 7788 AS gid FROM mailbox WHERE username = '%u'
 password_query = SELECT password FROM mailbox WHERE username = '%u'

dovecot/run.sh

@@ -1,22 +1,30 @@
-#! /usr/bin/env sh
+#! /usr/bin/env bash
 
-replace_vars()
+replace_var()
 {
   file="${1}"
-  sed -e "s/DOVECOT_LMTP_PORT/${DOVECOT_LMTP_PORT}/" -i "${file}"
-  sed -e "s/DOVECOT_SASL_PORT/${DOVECOT_SASL_PORT}/" -i "${file}"
-  sed -e "s/EXIM_SMARTHOST_HOST/${EXIM_SMARTHOST_HOST}/" -i "${file}"
-  sed -e "s/EXIM_SMARTHOST_USER/${EXIM_SMARTHOST_USER}/" -i "${file}"
-  sed -e "s/EXIM_SMARTHOST_PASSWORD/${EXIM_SMARTHOST_PASSWORD}/" -i "${file}"
+  var="${2}"
+  sed -e "s?${var}?${!var}?g" -i "${file}"
 }
 
-sed -e "s/connect *=.*/connect = host=${POSTGRES_HOST} dbname=${POSTGRES_DB} user=${POSTGRES_USER} password=${POSTGRES_PASSWORD}/g" -i /etc/dovecot/dovecot-pgsql.conf
-
+replace_vars()
+{
+  file="${1}"
+  for var in $(cat /etc/vars-vars)
+  do
+    replace_var "${file}" "${var}"
+  done
+}
 
-replace_vars /etc/dovecot/dovecot.conf
-replace_vars /etc/exim4/update-exim4.conf.conf
-replace_vars /etc/exim4/passwd.client
+replace_files()
+{
+  for file in $(cat /etc/vars-files)
+  do
+    replace_vars "${file}"
+  done
+}
 
+replace_files
 
 rm -f /var/run/dovecot/master.pid &&
 rm -f /var/run/exim4/exim.pid &&

dovecot/vars-files

@@ -0,0 +1,4 @@
+/etc/dovecot/dovecot.conf
+/etc/dovecot/dovecot-pgsql.conf
+/etc/exim4/update-exim4.conf.conf
+/etc/exim4/passwd.client

dovecot/vars-vars

@@ -0,0 +1,20 @@
+POSTGRES_HOST
+POSTGRES_USER
+POSTGRES_PASSWORD
+POSTGRES_DB
+
+MAIL_DOMAIN
+MAIL_HOSTNAME
+
+DOVECOT_HOST
+DOVECOT_SASL_PORT
+DOVECOT_LMTP_PORT
+
+POSTFIX_HOST
+
+OPENDKIM_HOST
+OPENDKIM_PORT
+
+EXIM_SMARTHOST_HOST
+EXIM_SMARTHOST_USER
+EXIM_SMARTHOST_PASSWORD

opendkim/Dockerfile

@@ -22,6 +22,10 @@ COPY ./config /etc/opendkim/
 
 RUN chown -R opendkim:opendkim /etc/opendkim
 
+COPY ./vars-vars /etc/vars-vars
+
+COPY ./vars-files /etc/vars-files
+
 COPY ./run.sh /run.sh
 
 VOLUME ["/etc/opendkim/keys"]

opendkim/run.sh

@@ -1,11 +1,30 @@
-#! /usr/bin/env sh
+#! /usr/bin/env bash
 
-sed -e "s/POSTGRES_HOST/${POSTGRES_HOST}/" -i /etc/opendkim/opendkim.conf
-sed -e "s/POSTGRES_USER/${POSTGRES_USER}/" -i /etc/opendkim/opendkim.conf
-sed -e "s/POSTGRES_PASSWORD/${POSTGRES_PASSWORD}/" -i /etc/opendkim/opendkim.conf
-sed -e "s/POSTGRES_DB/${POSTGRES_DB}/" -i /etc/opendkim/opendkim.conf
-sed -e "s/OPENDKIM_PORT/${OPENDKIM_PORT}/" -i /etc/opendkim/opendkim.conf
-sed -e "s/MAIL_DOMAIN/${MAIL_DOMAIN}/" -i /etc/opendkim/KeyTable
+replace_var()
+{
+  file="${1}"
+  var="${2}"
+  sed -e "s?${var}?${!var}?g" -i "${file}"
+}
+
+replace_vars()
+{
+  file="${1}"
+  for var in $(cat /etc/vars-vars)
+  do
+    replace_var "${file}" "${var}"
+  done
+}
+
+replace_files()
+{
+  for file in $(cat /etc/vars-files)
+  do
+    replace_vars "${file}"
+  done
+}
+
+replace_files
 
 if [ ! -e /etc/opendkim/keys/dkim.private ]
 then

opendkim/vars-files

@@ -0,0 +1,2 @@
+/etc/opendkim/opendkim.conf
+/etc/opendkim/KeyTable

opendkim/vars-vars

@@ -0,0 +1,20 @@
+POSTGRES_HOST
+POSTGRES_USER
+POSTGRES_PASSWORD
+POSTGRES_DB
+
+MAIL_DOMAIN
+MAIL_HOSTNAME
+
+DOVECOT_HOST
+DOVECOT_SASL_PORT
+DOVECOT_LMTP_PORT
+
+POSTFIX_HOST
+
+OPENDKIM_HOST
+OPENDKIM_PORT
+
+EXIM_SMARTHOST_HOST
+EXIM_SMARTHOST_USER
+EXIM_SMARTHOST_PASSWORD

postfix/Dockerfile

@@ -26,6 +26,10 @@ COPY ./config/ /etc/postfix/
 
 COPY ./certs/ /etc/ssl/private/
 
+COPY ./vars-vars /etc/vars-vars
+
+COPY ./vars-files /etc/vars-files
+
 COPY ./run.sh /run.sh
 
 EXPOSE 25 587

postfix/config/main.cf

@@ -20,8 +20,8 @@ readme_directory = no
 # See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
 # information on enabling SSL in the smtp client.
 
-mydomain = example.org
-myhostname = mail.example.org
+mydomain = MAIL_DOMAIN
+myhostname = MAIL_HOSTNAME
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = $mydomain
@@ -44,7 +44,7 @@ relay_domains = pgsql:/etc/postfix/pgsql_relay_domains.cf
 virtual_minimum_uid=100
 virtual_uid_maps=static:7788
 virtual_gid_maps=static:7788
-virtual_transport=dovecot_24
+virtual_transport=lmtp:inet:DOVECOT_HOST:DOVECOT_LMTP_PORT
 dovecot_destination_recipient_limit = 1
 
 
@@ -65,7 +65,7 @@ queue_directory=/var/spool/postfix
 
 
 smtpd_sasl_type=dovecot
-smtpd_sasl_path=dovecot_12345
+smtpd_sasl_path=inet:DOVECOT_HOST:DOVECOT_SASL_PORT
 smtpd_sasl_auth_enable=yes
 broken_sasl_auth_clients=yes
 smtpd_sasl_security_options=noanonymous
@@ -83,8 +83,8 @@ message_size_limit = 0
 
 milter_default_action = accept
 milter_protocol = 6
-smtpd_milters = opendkim_12345
-non_smtpd_milters = opendkim_12345
+smtpd_milters = inet:OPENDKIM_HOST:OPENDKIM_PORT
+non_smtpd_milters = inet:OPENDKIM_HOST:OPENDKIM_PORT
 smtpd_relay_restrictions = permit_mynetworks,
         permit_sasl_authenticated,
         reject_unknown_recipient_domain,

postfix/config/pgsql_recipient_bcc.cf

@@ -1,5 +1,5 @@
-hosts = 127.0.0.1
-user = postfixadmin
-password = pg_password
-dbname = postfixadmin
+hosts = POSTGRES_HOST
+user = POSTGRES_USER
+password = POSTGRES_PASSWORD
+dbname = POSTGRES_DB
 query = SELECT bcc FROM recipient_bcc WHERE recipient='%s'

postfix/config/pgsql_relay_domains.cf

@@ -1,5 +1,5 @@
-hosts = 127.0.0.1
-user = postfixadmin
-password = pg_password
-dbname = postfixadmin
+hosts = POSTGRES_HOST
+user = POSTGRES_USER
+password = POSTGRES_PASSWORD
+dbname = POSTGRES_DB
 query = SELECT domain FROM domain WHERE domain='%s' and backupmx = true

postfix/config/pgsql_transport.cf

@@ -1,5 +1,5 @@
-hosts = 127.0.0.1
-user = postfixadmin
-password = pg_password
-dbname = postfixadmin
+hosts = POSTGRES_HOST
+user = POSTGRES_USER
+password = POSTGRES_PASSWORD
+dbname = POSTGRES_DB
 query = SELECT transport FROM transport WHERE domain='%s'

postfix/config/pgsql_virtual_alias_maps.cf

@@ -1,5 +1,5 @@
-hosts = 127.0.0.1
-user = postfixadmin
-password = pg_password
-dbname = postfixadmin
+hosts = POSTGRES_HOST
+user = POSTGRES_USER
+password = POSTGRES_PASSWORD
+dbname = POSTGRES_DB
 query = SELECT goto FROM alias WHERE address='%s' AND active = true AND is_regexp = false

postfix/config/pgsql_virtual_alias_maps_alias.cf

@@ -1,5 +1,5 @@
-hosts = 127.0.0.1
-user = postfixadmin
-password = pg_password
-dbname = postfixadmin
+hosts = POSTGRES_HOST
+user = POSTGRES_USER
+password = POSTGRES_PASSWORD
+dbname = POSTGRES_DB
 query = SELECT goto FROM alias WHERE address=((regexp_split_to_array('%s', '\+|@'))[1]) || '@' || split_part('%s', '@', 2) AND active = true AND is_regexp = false

postfix/config/pgsql_virtual_alias_maps_regexp.cf

@@ -1,5 +1,5 @@
-hosts = 127.0.0.1
-user = postfixadmin
-password = pg_password
-dbname = postfixadmin
+hosts = POSTGRES_HOST
+user = POSTGRES_USER
+password = POSTGRES_PASSWORD
+dbname = POSTGRES_DB
 query = SELECT goto FROM alias WHERE '%s' ILIKE CONCAT('^',address,'$') AND SUBSTRING(address,1,1) != '@' AND is_regexp = true

postfix/config/pgsql_virtual_mailbox_domains.cf

@@ -1,5 +1,5 @@
-hosts = 127.0.0.1
-user = postfixadmin
-password = pg_password
-dbname = postfixadmin
+hosts = POSTGRES_HOST
+user = POSTGRES_USER
+password = POSTGRES_PASSWORD
+dbname = POSTGRES_DB
 query = SELECT domain FROM domain WHERE domain='%s' and backupmx = false and active = true

postfix/config/pgsql_virtual_mailbox_maps.cf

@@ -1,5 +1,5 @@
-hosts = 127.0.0.1
-user = postfixadmin
-password = pg_password
-dbname = postfixadmin
+hosts = POSTGRES_HOST
+user = POSTGRES_USER
+password = POSTGRES_PASSWORD
+dbname = POSTGRES_DB
 query = SELECT maildir FROM mailbox WHERE username='%s' AND active = true

postfix/run.sh

@@ -1,17 +1,36 @@
-#! /usr/bin/env sh
+#! /usr/bin/env bash
+
+replace_var()
+{
+  file="${1}"
+  var="${2}"
+  sed -e "s?${var}?${!var}?g" -i "${file}"
+}
+
+replace_vars()
+{
+  file="${1}"
+  for var in $(cat /etc/vars-vars)
+  do
+    replace_var "${file}" "${var}"
+  done
+}
+
+replace_files()
+{
+  for file in $(cat /etc/vars-files)
+  do
+    replace_vars "${file}"
+  done
+}
+
+replace_files
 
 sed -e "s/hosts *=.*/hosts = ${POSTGRES_HOST}/g" -i /etc/postfix/pgsql_*
 sed -e "s/user *=.*/user = ${POSTGRES_USER}/g" -i /etc/postfix/pgsql_*
 sed -e "s/password *=.*/password = ${POSTGRES_PASSWORD}/g" -i /etc/postfix/pgsql_*
 sed -e "s/dbname *=.*/dbname = ${POSTGRES_DB}/g" -i /etc/postfix/pgsql_*
 
-postconf -e mydomain="${MAIL_DOMAIN}"
-postconf -e myhostname="${MAIL_HOSTNAME}"
-postconf -e smtpd_sasl_path="inet:${DOVECOT_HOST}:${DOVECOT_SASL_PORT}"
-postconf -e virtual_transport="lmtp:inet:${DOVECOT_HOST}:${DOVECOT_LMTP_PORT}"
-postconf -e smtpd_milters="inet:${OPENDKIM_HOST}:${OPENDKIM_PORT}"
-postconf -e non_smtpd_milters="inet:${OPENDKIM_HOST}:${OPENDKIM_PORT}"
-
 rm -f /var/run/rsyslogd.pid
 service rsyslog start &&
 service postfix start &&

postfix/vars-files

@@ -0,0 +1,9 @@
+/etc/postfix/main.cf
+/etc/postfix/pgsql_recipient_bcc.cf
+/etc/postfix/pgsql_relay_domains.cf
+/etc/postfix/pgsql_transport.cf
+/etc/postfix/pgsql_virtual_alias_maps_alias.cf
+/etc/postfix/pgsql_virtual_alias_maps.cf
+/etc/postfix/pgsql_virtual_alias_maps_regexp.cf
+/etc/postfix/pgsql_virtual_mailbox_domains.cf
+/etc/postfix/pgsql_virtual_mailbox_maps.cf

postfix/vars-vars

@@ -0,0 +1,20 @@
+POSTGRES_HOST
+POSTGRES_USER
+POSTGRES_PASSWORD
+POSTGRES_DB
+
+MAIL_DOMAIN
+MAIL_HOSTNAME
+
+DOVECOT_HOST
+DOVECOT_SASL_PORT
+DOVECOT_LMTP_PORT
+
+POSTFIX_HOST
+
+OPENDKIM_HOST
+OPENDKIM_PORT
+
+EXIM_SMARTHOST_HOST
+EXIM_SMARTHOST_USER
+EXIM_SMARTHOST_PASSWORD

postfixadmin/Dockerfile

@@ -32,6 +32,10 @@ COPY ./postfixadmin-3.0/ /var/www/html/
 
 RUN chmod -R 777 /var/www/html/templates_c
 
+COPY ./vars-vars /etc/vars-vars
+
+COPY ./vars-files /etc/vars-files
+
 COPY ./run.sh /run.sh
 
 EXPOSE 80

postfixadmin/run.sh

@@ -1,6 +1,30 @@
-#!/bin/bash
+#! /usr/bin/env bash
 
-sed -e "s/POSTFIX_HOST/${POSTFIX_HOST}/" -i /var/www/html/config.inc.php
+replace_var()
+{
+  file="${1}"
+  var="${2}"
+  sed -e "s?${var}?${!var}?g" -i "${file}"
+}
+
+replace_vars()
+{
+  file="${1}"
+  for var in $(cat /etc/vars-vars)
+  do
+    replace_var "${file}" "${var}"
+  done
+}
+
+replace_files()
+{
+  for file in $(cat /etc/vars-files)
+  do
+    replace_vars "${file}"
+  done
+}
+
+replace_files
 
 rm -f /run/apache2/apache2.pid
 exec /usr/sbin/apache2ctl -D FOREGROUND

postfixadmin/vars-files

@@ -0,0 +1 @@
+/var/www/html/config.inc.php

postfixadmin/vars-vars

@@ -0,0 +1,20 @@
+POSTGRES_HOST
+POSTGRES_USER
+POSTGRES_PASSWORD
+POSTGRES_DB
+
+MAIL_DOMAIN
+MAIL_HOSTNAME
+
+DOVECOT_HOST
+DOVECOT_SASL_PORT
+DOVECOT_LMTP_PORT
+
+POSTFIX_HOST
+
+OPENDKIM_HOST
+OPENDKIM_PORT
+
+EXIM_SMARTHOST_HOST
+EXIM_SMARTHOST_USER
+EXIM_SMARTHOST_PASSWORD

update_vars.sh

@@ -0,0 +1,7 @@
+#! /usr/bin/env sh
+
+vars=$(cat env | cut -d= -f1)
+for docker in dovecot opendkim postfix postfixadmin
+do
+  echo "${vars}" > "./${docker}/vars-vars"
+done