* Automatic Dockerfile update by release process

Dockerfile

@@ -1,21 +1,27 @@
-FROM        debian:buster-slim
+FROM        debian:stretch-slim
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ARG LSMB_VERSION="1.8.18"
+ARG LSMB_VERSION="1.7.10"
 ARG LSMB_DL_DIR="Releases"
-ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz"
 
 # Install Perl, Tex, Starman, psql client, and all dependencies
 # Without libclass-c3-xs-perl, performance is terribly slow...
+# Without libclass-accessor-lite-perl, HTML::Entities won't build from CPAN
+# libnet-cidr-lite-perl is a dependency for Plack::Builder::Conditionals
+#   which is being installed from CPAN
+# libtest-requires-perl is a dependency of Module-Build-Pluggable-PPPort
+#   on which HTML::Escape depends
 
 # Installing psql client directly from instructions at https://wiki.postgresql.org/wiki/Apt
 # That mitigates issues where the PG instance is running a newer version than this container
-# Install Locale::Codes Locale::Country Locale::Language from CPAN to suppress
-# deprecation-as-core-module warning
 
-RUN set -x ; \
+# for Buster, add:
-  echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >> /etc/apt/apt.conf && \
+#    libhtml-escape-perl \
+#    libplack-middleware-builder-conditionals-perl \
+#    libplack-request-withencoding-perl \
+#libversion-compare-perl
+RUN echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >> /etc/apt/apt.conf && \
   mkdir -p /usr/share/man/man1/ && \
   mkdir -p /usr/share/man/man2/ && \
   mkdir -p /usr/share/man/man3/ && \
@@ -23,49 +29,45 @@ RUN set -x ; \
   mkdir -p /usr/share/man/man5/ && \
   mkdir -p /usr/share/man/man6/ && \
   mkdir -p /usr/share/man/man7/ && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
+  DEBIAN_FRONTEND="noninteractive" apt-get update -q && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y upgrade && \
+  DEBIAN_FRONTEND="noninteractive" apt-get dist-upgrade -y -q && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y install \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y -q install \
     wget ca-certificates gnupg \
-    libauthen-sasl-perl libcgi-emulate-psgi-perl libconfig-inifiles-perl \
+    libcgi-emulate-psgi-perl libconfig-inifiles-perl \
-    libcookie-baker-perl libdbd-pg-perl libdbi-perl libdata-uuid-perl \
+    libdbd-pg-perl libdbi-perl libdata-uuid-perl libdatetime-perl \
-    libdatetime-perl libdatetime-format-strptime-perl \
+    libdatetime-format-strptime-perl \
-    libemail-sender-perl libemail-stuffer-perl libfile-find-rule-perl \
+    libio-stringy-perl \
-    libhtml-escape-perl libhttp-headers-fast-perl libio-stringy-perl \
+    libcpanel-json-xs-perl liblist-moreutils-perl \
-    libjson-maybexs-perl libcpanel-json-xs-perl libjson-pp-perl \
-    liblist-moreutils-perl \
     liblocale-maketext-perl liblocale-maketext-lexicon-perl \
-    liblog-log4perl-perl libmime-types-perl \
+    liblog-log4perl-perl libmime-lite-perl libmime-types-perl \
-    libmath-bigint-gmp-perl libmodule-runtime-perl libmoo-perl \
+    libmath-bigint-gmp-perl libmodule-runtime-perl libmoose-perl \
-    libmoox-types-mooselike-perl libmoose-perl \
     libmoosex-nonmoose-perl libnumber-format-perl \
     libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \
     libpgobject-type-bigfloat-perl libpgobject-type-datetime-perl \
     libpgobject-type-bytestring-perl libpgobject-util-dbmethod-perl \
     libpgobject-util-dbadmin-perl libplack-perl \
-    libplack-builder-conditionals-perl libplack-middleware-reverseproxy-perl \
+    libplack-middleware-reverseproxy-perl \
-    libplack-request-withencoding-perl libscope-guard-perl \
-    libsession-storage-secure-perl libstring-random-perl \
     libtemplate-perl libtext-csv-perl libtext-csv-xs-perl \
-    libtext-markdown-perl libtry-tiny-perl libversion-compare-perl \
+    libtext-markdown-perl  libxml-simple-perl \
-    libxml-libxml-perl libnamespace-autoclean-perl \
+    libnamespace-autoclean-perl \
-    starman starlet libhttp-parser-xs-perl \
+    libfile-find-rule-perl \
     libtemplate-plugin-latex-perl libtex-encode-perl \
-    libxml-twig-perl libopenoffice-oodoc-perl \
+    libclass-c3-xs-perl libclass-accessor-lite-perl \
-    libexcel-writer-xlsx-perl libspreadsheet-writeexcel-perl \
+    libnet-cidr-lite-perl \
-    libclass-c3-xs-perl liblocale-codes-perl \
+    texlive-latex-recommended \
-    texlive-latex-recommended texlive-fonts-recommended \
     texlive-xetex fonts-liberation \
+    starman \
+    libopenoffice-oodoc-perl \
+    ssmtp \
     lsb-release && \
   echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
   (wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -) && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -q -y update && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y install postgresql-client && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install postgresql-client && \
   DEBIAN_FRONTEND="noninteractive" apt-get -q -y install git cpanminus make gcc libperl-dev && \
-  wget --quiet -O /tmp/ledgersmb-$LSMB_VERSION.tar.gz "$ARTIFACT_LOCATION" && \
+  wget --quiet -O /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
   tar -xzf /tmp/ledgersmb-$LSMB_VERSION.tar.gz --directory /srv && \
   rm -f /tmp/ledgersmb-$LSMB_VERSION.tar.gz && \
-  cpanm --reinstall --notest Locale::Country Locale::Codes Locale::Language && \
   cpanm --notest \
     --with-feature=starman \
     --with-feature=latex-pdf-ps \
@@ -73,8 +75,9 @@ RUN set -x ; \
     --installdeps /srv/ledgersmb/ && \
   apt-get purge -q -y git cpanminus make gcc libperl-dev && \
   apt-get autoremove -q -y && \
-  apt-get clean -q && \
+  apt-get autoclean -q && \
-  rm -rf ~/.cpanm/ /var/lib/apt/lists/* /usr/share/man/*
+  rm -rf ~/.cpanm/ && \
+  rm -rf /var/lib/apt/lists/* /usr/share/man/*
 
 
 WORKDIR /srv/ledgersmb
@@ -83,27 +86,30 @@ WORKDIR /srv/ledgersmb
 
 # Configure outgoing mail to use host, other run time variable defaults
 
-## MAIL
+## sSMTP
-ENV LSMB_MAIL_SMTPHOST 172.17.0.1
+ENV SSMTP_ROOT ar@example.com
-#ENV LSMB_MAIL_SMTPPORT 25
+ENV SSMTP_MAILHUB 172.17.0.1
-#ENV LSMB_MAIL_SMTPSENDER_HOSTNAME (container hostname)
+ENV SSMTP_HOSTNAME 172.17.0.1
-#ENV LSMB_MAIL_SMTPTLS
+#ENV SSMTP_USE_STARTTLS
-#ENV LSMB_MAIL_SMTPUSER
+#ENV SSMTP_AUTH_USER
-#ENV LSMB_MAIL_SMTPPASS
+#ENV SSMTP_AUTH_PASS
-#ENV LSMB_MAIL_SMTPAUTHMECH
+ENV SSMTP_FROMLINE_OVERRIDE YES
+#ENV SSMTP_AUTH_METHOD
 
-## DATABASE
 ENV POSTGRES_HOST postgres
 ENV POSTGRES_PORT 5432
 ENV DEFAULT_DB lsmb
 
 COPY start.sh /usr/local/bin/start.sh
+COPY update_ssmtp.sh /usr/local/bin/update_ssmtp.sh
 
-RUN chmod +x /usr/local/bin/start.sh && \
+RUN chown www-data /etc/ssmtp /etc/ssmtp/ssmtp.conf && \
+  chmod +x /usr/local/bin/update_ssmtp.sh /usr/local/bin/start.sh && \
   mkdir -p /var/www
 
 # Work around an aufs bug related to directory permissions:
-RUN mkdir -p /tmp && chmod 1777 /tmp
+RUN mkdir -p /tmp && \
+  chmod 1777 /tmp
 
 # Internal Port Expose
 EXPOSE 5762

README.md

@@ -1,18 +1,14 @@
 # ledgersmb-docker
-
 Dockerfile for LedgerSMB Docker image
 
 # Supported tags
 
-- `1.8`, `1.8.x`, `latest` - Latest official release from the 1.8 branch
+- `1.7`, `1.7.x`, `latest` - Latest official release from 1.7 branch
-- `1.7`, `1.7.x` - Latest official release from 1.7 branch
+- `1.6`, `1.6.x` - Latest official release from 1.6 branch
-- `1.6`, `1.6.33` - Last official release from 1.6 branch 
 - `1.5`, `1.5.30` - Last official release from 1.5 branch
 - `1.4`, `1.4.42` - Last official release from 1.4 branch
 - `master` - Master branch from git, unstable
 
-Containers supporting the development process are provided
-through the [ledgersmb-dev-docker project](https://github.com/ledgersmb/ledgersmb-dev-docker/blob/master/README.md#getting-started).
 
 # What is LedgerSMB?
 
@@ -29,9 +25,9 @@ This image is designed to be used in conjunction with a running PostgreSQL
 instance (such as may be provided through a separate image).
 
 This image exposes port 5762 running a Starman HTTP application server. We
-do recommend not exposing this port publicly, because
+do not recommend exposing this port publicly, because
 
-1. The Starman author recommends not exposing it
+1. The Starman author recommends it
 2. We strongly recommend TLS encryption of all application traffic
 
 While the exposed port can be used for quick evaluation, it's recommended
@@ -40,57 +36,33 @@ to add the TLS layer by applying Nginx or Apache as reverse proxy.
 Enabling optional functionalities such as outgoing e-mail and printing
 could require additional setup of a mail service or CUPS printer service.
 
-# How to use this image
+# Quickstart
 
-This image can be installed either automatically with the Docker compose file
+The quickest way to get this image up and running is by using the
-or manually with docker only.
+`docker-compose` file available through the GitHub repository at:
 
-## Docker-Compose installation and start
+  https://github.com/ledgersmb/ledgersmb-docker/blob/1.7/docker-compose.yml
 
-This image provides `docker-compose.yml` which can be used to pull related
+which sets up both this image and a supporting database image for
-images, install them, establish an internal network for their communications,
+production purposes (i.e. with persistent (database) data. The database
-adjust environment variables, start and stop LedgerSMB. The only instructions
+username and password are:
-required, after the optional edition of the file to adjust the environment
-variables, are:
-
-```plain
- $ docker-compose pull
- $ docker-compose up -d
-```
-
-This will set up two containers: (1) a PostgreSQL container with persistent
-storage which is retained between container updates and (2) a LedgerSMB
-container configured to connect to the PostgreSQL container as its database
-server. The containers will be running in the background and can be stopped
-and started by running:
-
-```plain
-# Stopping the containers
-$ docker-compose stop
-
-# Starting the containers
-$ docker-compose start
-```
-
-(Check the status of the containers using `docker-compose ps`; when the
-containers are running, the `State` column shows `Up`.)
-
-The database username and password are:
 
 ```plain
    username: postgres
    password: abc
 ```
 
-From here, follow the steps as detailed in the instructions for
+The docker-compose file does *not* set up an Nginx or Apache reverse proxy
-[preparing for first use](https://ledgersmb.org/content/preparing-ledgersmb-17-first-use).
+with TLS 1.2/1.3 support -- a requirement if you want to access your
+installation over any type of network (and especially the internet).
+
 
 ## Manual installation
 
 This section assumes availability of a PostgreSQL server to attach to the
 LedgerSMB image as the database server.
 
-### Start LedgerSMB
+## Start LedgerSMB
 
 ```plain
  $ docker run -d -p 5762:5762 --name myledger \
@@ -104,7 +76,7 @@ http://localhost:5762/setup.pl and http://localhost:5762/login.pl.
 Below are more variables which determine container configuration,
 like `POSTGRES_HOST` above.
 
-# Set up LedgerSMB
+## Set up LedgerSMB
 
  * Visit http://myledger:5762/setup.pl.
  * Log in with the "postgres" user and the password `abc` as given above -
@@ -160,36 +132,21 @@ affect the performance experience of users.
 
 ## Mail configuration
 
-### 1.8.0 and higher
+The docker image uses `ssmtp` to send mail.
 
-As of 1.8.0, the image is based on Debian Buster instead of Debian Stretch;
+* `SSMTP_ROOT` (config: `Root`)
-with Buster, the `ssmtp` program has been removed from Debian, this image
-had to change strategy. The main application always came with built-in e-mail
-yet with the deprecation, the abilities have expanded.
-
-The following parameters are now supported to set mail preferences:
-
-* `LSMB_MAIL_SMTPHOST`
-* `LSMB_MAIL_SMTPPORT`
-* `LSMB_MAIL_SMTPTLS`
-* `LSMB_MAIL_SMTPSENDER_HOSTNAME`
-* `LSMB_MAIL_SMTPUSER`
-* `LSMB_MAIL_SMTPPASS`
-* `LSMB_MAIL_SMTPAUTHMECH`
-
-
-### Before 1.8.0
-
-These variables are used to set outgoing SMTP defaults.
-
-* `SSMTP_ROOT` (config: `Root` -- DEPRECATED)
 * `SSMTP_MAILHUB` (config: `Mailhub`)
 * `SSMTP_HOSTNAME` (config: `Hostname`)
 * `SSMTP_USE_STARTTLS` (config: `UseSTARTTLS`)
 * `SSMTP_AUTH_USER` (config: `AuthUser`)
 * `SSMTP_AUTH_PASS` (config: `AuthPass`)
-* `SSMTP_AUTH_METHOD` (config: `AuthMethod` -- DEPRECATED)
+* `SSMTP_AUTH_METHOD` (config: `AuthMethod`)
-* `SSMTP_FROMLINE_OVERRIDE` (config: `FromLineOverride` -- DEPRECATED)
+* `SSMTP_FROMLINE_OVERRIDE` (config: `FromLineOverride`)
+
+These variables are used to set outgoing SMTP defaults.
+
+To set the outgoing email address, set `SSMTP_ROOT` and `SSMTP_HOSTNAME` at
+a minimum.
 
 `SSMTP_MAILHUB` defaults to the default docker0 interface, so if your host is
 already configured to relay mail, this should relay successfully with only

docker-compose.yml

@@ -28,18 +28,18 @@ services:
   lsmb:
     depends_on:
       - postgres
-    image: ledgersmb/ledgersmb:1.8
+    image: ledgersmb/ledgersmb:1.7
     networks:
       - internal
       - default
-    # Comment the 'ports' section to disable mapping the LedgerSMB container port (5762)
+    # Uncomment the 'ports' section to map the LedgerSMB container port (5762)
     #  to the host's port of the same number, thus making LedgerSMB
     #  available on http://<host-dns-or-ip>:5762/
     #     SECURITY NOTE: Do this for evaluation purposes only!
     #       In production, be sure to use SSL/TLS to protect user's passwords
     #       and other sensitive data
-    ports:
+    # ports:
-      - "5762:5762"
+    #   - "5762:5762"
     environment:
       # The LSMB_WORKERS environment variable lets you select the number
       # of processes serving HTTP requests. The default number of 2 workers

start.sh

@@ -1,105 +1,33 @@
 #!/bin/bash
 
+update_ssmtp.sh
 cd /srv/ledgersmb
 
-if [[ -n "$SSMTP_ROOT" ]]; then
-    echo "\$SSMTP_ROOT set; parameter is deprecated and will be ignored"
-    LSMB_HAVE_DEPRECATED=1
-fi
-if [[ -n "$SSMTP_FROMLINE_OVERRIDE" ]]; then
-    echo "\$SSMTP_FROMLINE_OVERRIDE set; parameter is deprecated and will be ignored"
-    LSMB_HAVE_DEPRECATED=1
-fi
-if [[ -n "$SSMTP_MAILHUB" ]]; then
-    echo "\$SSMTP_MAILHUB set; parameter is deprecated"
-    if [[ -z "$LSMB_MAIL_SMTPHOST" ]]; then
-        echo "  Deriving \$LSMB_MAIL_SMTPHOST setting from \$SSMTP_MAILHUB"
-        LSMB_MAIL_SMTPHOST=${SSMTP_MAILHUB%:*}
-    fi
-    if [[ -z "$LSMB_MAIL_SMTPPORT" ]]; then
-        echo "  Deriving \$LSMB_MAIL_SMTPPORT setting from \$SSMTP_MAILHUB"
-        LSMB_MAIL_SMTPPORT=${SSMTP_MAILHUB#*:}
-    fi
-    LSMB_HAVE_DEPRECATED=1
-fi
-if [[ -n "$SSMTP_HOSTNAME" ]]; then
-    echo "\$SSMTP_HOSTNAME set; parameter is deprecated"
-    if [[ -z "$LSMB_MAIL_SMTPSENDER_HOSTNAME" ]]; then
-        echo "  Deriving \$LSMB_MAIL_SMTPSENDER_HOSTNAME setting from \$SSMTP_HOSTNAME"
-        LSMB_MAIL_SMTPSENDER_HOSTNAME=$SSMTP_HOSTNAME
-    fi
-    LSMB_HAVE_DEPRECATED=1
-fi
-if [[ -n "$SSMTP_USE_STARTTLS" ]]; then
-    echo "\$SSMTP_USE_STARTTLS set; parameter is deprecated"
-    if [[ -z "$LSMB_MAIL_SMTPTLS" ]]; then
-        echo "  Deriving \$LSMB_MAIL_SMTPSENDER_HOSTNAME setting from \$SSMTP_USE_STARTTLS"
-        LSMB_MAIL_SMTPTLS=$SSMTP_USE_STARTTLS
-    fi
-    LSMB_HAVE_DEPRECATED=1
-fi
-if [[ -n "$SSMTP_AUTH_USER" ]]; then
-    echo "\$SSMTP_AUTH_USER set; parameter is deprecated"
-    if [[ -z "$LSMB_MAIL_SMTPUSER" ]]; then
-        echo "  Deriving \$LSMB_MAIL_SMTPUSER setting from \$SSMTP_AUTH_USER"
-        LSMB_MAIL_SMTPUSER=$SSMTP_AUTH_USER
-    fi
-    LSMB_HAVE_DEPRECATED=1
-fi
-if [[ -n "$SSMTP_AUTH_PASS" ]]; then
-    echo "\$SSMTP_AUTH_PASS set; parameter is deprecated"
-    if [[ -z "$LSMB_MAIL_SMTPPASS" ]]; then
-        echo "  Deriving \$LSMB_MAIL_SMTPPASS setting from \$SSMTP_AUTH_PASS"
-        LSMB_MAIL_SMTPPASS=$SSMTP_AUTH_PASS
-    fi
-    LSMB_HAVE_DEPRECATED=1
-fi
-if [[ -n "$SSMTP_AUTH_METHOD" ]]; then
-    echo "\$SSMTP_AUTH_METHOD set; parameter is deprecated"
-    if [[ -z "$LSMB_MAIL_SMTPAUTHMECH" ]]; then
-        echo "  Deriving \$LSMB_MAIL_SMTPAUTHMECH setting from \$SSMTP_AUTH_METHOD"
-        LSMB_MAIL_SMTPAUTHMECH=$SSMTP_AUTH_METHOD
-    fi
-    LSMB_HAVE_DEPRECATED=1
-fi
-
-if [[ -n "$LSMB_HAVE_DEPRECATED" ]]; then
-    echo "!!! DEPRECATED \$SSMTP_* PARAMETERS WILL BE REMOVED in the 1.9 image!!!"
-fi
-
-
 if [[ ! -f ledgersmb.conf ]]; then
   cat <<EOF >/tmp/ledgersmb.conf
 [main]
 cache_templates = 1
+
 [database]
 host = $POSTGRES_HOST
 port = $POSTGRES_PORT
 default_db = $DEFAULT_DB
+
 [mail]
-${LSMB_MAIL_SMTPHOST:+smtphost=$LSMB_MAIL_SMTPHOST
+sendmail   = /usr/sbin/ssmtp
-}${LSMB_MAIL_SMTPPORT:+smtpport=$LSMB_MAIL_SMTPPORT
+
-}${LSMB_MAIL_SMTPSENDER_HOSTNAME:+smtpsender_hostname=$LSMB_MAIL_SMTPSENDER_HOSTNAME
-}${LSMB_MAIL_SMTPTLS:+smtptls=$LSMB_MAIL_SMTPTLS
-}${LSMB_MAIL_SMTPUSER:+smtpuser=$LSMB_MAIL_SMTPUSER
-}${LSMB_MAIL_SMTPPASS:+smtppass=$LSMB_MAIL_SMTPPASS
-}${LSMB_MAIL_SMTPAUTHMECH:+smtpauthmech=$LSMB_MAIL_SMTPAUTHMECH
-}
 EOF
   export LSMB_CONFIG_FILE='/tmp/ledgersmb.conf'
 fi
 
+if [ ! -d "/tmp/ledgersmb" ]; then
+  mkdir -p /tmp/ledgersmb
+fi
+
 # start ledgersmb
 # --preload-app allows application initialization to kill the entire
 # starman instance (instead of just the worker, which will immediately
-# get restarted) on error; it also has a positive effect on memory use
+# get restarted); it also has a positive effect on memory use
 
-echo '--------- LEDGERSMB CONFIGURATION:  ledgersmb.conf'
+exec starman --port 5762 --workers ${LSMB_WORKERS:-5} -I lib -I old/lib \
-cat ${LSMB_CONFIG_FILE:-ledgersmb.conf}
+        --preload-app bin/ledgersmb-server.psgi
-echo '--------- LEDGERSMB CONFIGURATION --- END'
-
-# ':5762:' suppresses an uninitialized variable warning in starman
-# the last colon means "don't connect using tls"; without it, there's a warning
-exec starman --listen :5762: --max-workers ${LSMB_WORKERS:-5} \
-             -I lib -I old/lib \
-             --preload-app bin/ledgersmb-server.psgi

update_ssmtp.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+ConfiguredComment='# install script update_ssmtp.sh has configured ssmtp'
+grep -qc "$ConfiguredComment" /etc/ssmtp/ssmtp.conf && {
+    echo "smtp configured."
+    exit
+}
+
+sed -i \
+    -e "s/\(root=\).*\$/\1$SSMTP_ROOT/g" \
+    -e "s/\(mailhub=\).*\$/\1$SSMTP_MAILHUB/g" \
+    -e "s/\(hostname=\).*\$/\1$SSMTP_HOSTNAME/g" \
+    /etc/ssmtp/ssmtp.conf
+[ -z "$SSMTP_USE_STARTTLS" ] || echo "UseSTARTTLS=$SSMTP_USE_STARTTLS" >> /etc/ssmtp/ssmtp.conf
+[ -z "$SSMTP_AUTH_USER" ] || echo "AuthUser=$SSMTP_AUTH_USER" >> /etc/ssmtp/ssmtp.conf
+[ -z "$SSMTP_AUTH_PASS" ] || echo "AuthPass=$SSMTP_AUTH_PASS" >> /etc/ssmtp/ssmtp.conf
+[ -z "$SSMTP_AUTH_METHOD" ] || echo "AuthMethod=$SSMTP_AUTH_METHOD" >> /etc/ssmtp/ssmtp.conf
+[ -z "$SSMTP_FROMLINE_OVERRIDE" ] || echo "FromLineOverride=$SSMTP_FROMLINE_OVERRIDE" >> /etc/ssmtp/ssmtp.conf
+echo "$ConfiguredComment" >> /etc/ssmtp/ssmtp.conf