* Automatic Dockerfile update by release process

By default, map the starman port to localhost.

Dockerfile

@@ -1,121 +1,107 @@
-FROM        debian:stretch
+FROM        debian:buster-slim
 MAINTAINER  Freelock john@freelock.com
 
+# Build time variables
+ARG LSMB_VERSION="1.8.16"
+ARG LSMB_DL_DIR="Releases"
+
 # Install Perl, Tex, Starman, psql client, and all dependencies
-#
-# Without libclass-c3-xs-perl, everything grinds to a halt;
-# add it, because it's a 'recommends' it the dep tree, which
-# we're skipping, normally
-#
+# Without libclass-c3-xs-perl, performance is terribly slow...
+
 # 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 echo "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";" > /etc/apt/apt.conf.d/00recommends && \
-  DEBIAN_FRONTEND="noninteractive" apt-mark hold sensible-utils && \
+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/ && \
+  mkdir -p /usr/share/man/man4/ && \
+  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 -y upgrade && \
   DEBIAN_FRONTEND="noninteractive" apt-get -y install \
     wget ca-certificates gnupg \
-    libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
-    libdbd-pg-perl libdbi-perl libdata-uuid-perl libdatetime-perl \
-    libdatetime-format-strptime-perl libio-stringy-perl \
-    libjson-xs-perl libcpanel-json-xs-perl liblist-moreutils-perl \
+    libauthen-sasl-perl libcgi-emulate-psgi-perl libconfig-inifiles-perl \
+    libcookie-baker-perl libdbd-pg-perl libdbi-perl libdata-uuid-perl \
+    libdatetime-perl libdatetime-format-strptime-perl \
+    libemail-sender-perl libemail-stuffer-perl libfile-find-rule-perl \
+    libhtml-escape-perl libhttp-headers-fast-perl libio-stringy-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-lite-perl libmime-types-perl \
-    libmath-bigint-gmp-perl libmodule-runtime-perl libmoose-perl \
+    liblog-log4perl-perl libmime-types-perl \
+    libmath-bigint-gmp-perl libmodule-runtime-perl libmoo-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 libfile-find-rule-perl \
-    libplack-middleware-reverseproxy-perl \
+    libpgobject-util-dbadmin-perl libplack-perl \
+    libplack-builder-conditionals-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 libxml-simple-perl \
-    libnamespace-autoclean-perl \
-    libimage-size-perl \
+    libtext-markdown-perl libtry-tiny-perl libversion-compare-perl \
+    libxml-libxml-perl libnamespace-autoclean-perl \
+    starman starlet libhttp-parser-xs-perl \
     libtemplate-plugin-latex-perl libtex-encode-perl \
-    libclass-c3-xs-perl \
-    texlive-latex-recommended \
+    libxml-twig-perl libopenoffice-oodoc-perl \
+    libexcel-writer-xlsx-perl libspreadsheet-writeexcel-perl \
+    libclass-c3-xs-perl liblocale-codes-perl \
+    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 -y install postgresql-client && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y autoremove && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y autoclean && \
-  rm -rf /var/lib/apt/lists/*
-
-
-# Build time variables
-ENV LSMB_VERSION 1.7.0-beta1
-ENV NODE_PATH /usr/local/lib/node_modules
-
-
-###########################################################
-# Java & Nodejs for doing Dojo build
-# Uglify needs to be installed right before 'make dojo'?!
-
-# These packages are only needed during the dojo build
-ENV DOJO_Build_Deps git make gcc libperl-dev curl nodejs
-# These packages can be removed after the dojo build
-ENV DOJO_Build_Deps_removal ${DOJO_Build_Deps} nodejs
-
-RUN wget --quiet -O - https://deb.nodesource.com/setup_8.x | bash -
-RUN DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y install ${DOJO_Build_Deps} && \
-    cd /srv && \
-    git clone --recursive -b $LSMB_VERSION https://github.com/ledgersmb/LedgerSMB.git ledgersmb && \
-    cd ledgersmb && \
-    (curl -L https://cpanmin.us | perl - App::cpanminus) && \
-    cpanm --quiet --notest \
+  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install git cpanminus make gcc libperl-dev && \
+  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 \
     --with-feature=openoffice \
-      --installdeps .  && \
-    npm install uglify-js@">=2.0 <3.0" && \
-    make dojo && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y purge ${DOJO_Build_Deps_removal} && \
-    rm -rf /usr/local/lib/node_modules && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y autoremove && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y autoclean && \
-    rm -rf ~/.cpanm && \
-    rm -rf /var/lib/apt/lists/*
+    --installdeps /srv/ledgersmb/ && \
+  apt-get purge -q -y git cpanminus make gcc libperl-dev && \
+  apt-get autoremove -q -y && \
+  apt-get clean -q && \
+  rm -rf ~/.cpanm/ /var/lib/apt/lists/* /usr/share/man/*
 
-# Cleanup args that are for internal use
-ENV DOJO_Build_Deps=
-ENV DOJO_Build_Deps_removal=
-ENV NODE_PATH=
+
+WORKDIR /srv/ledgersmb
+
+# master requirements
 
 # Configure outgoing mail to use host, other run time variable defaults
 
-## sSMTP
-ENV SSMTP_ROOT ar@example.com
-ENV SSMTP_MAILHUB 172.17.0.1
-ENV SSMTP_HOSTNAME 172.17.0.1
-#ENV SSMTP_USE_STARTTLS
-#ENV SSMTP_AUTH_USER
-#ENV SSMTP_AUTH_PASS
-ENV SSMTP_FROMLINE_OVERRIDE YES
-#ENV SSMTP_AUTH_METHOD
+## MAIL
+ENV LSMB_MAIL_SMTPHOST 172.17.0.1
+#ENV LSMB_MAIL_SMTPPORT 25
+#ENV LSMB_MAIL_SMTPSENDER_HOSTNAME (container hostname)
+#ENV LSMB_MAIL_SMTPTLS
+#ENV LSMB_MAIL_SMTPUSER
+#ENV LSMB_MAIL_SMTPPASS
+#ENV LSMB_MAIL_SMTPAUTHMECH
 
+## 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 chown www-data /etc/ssmtp /etc/ssmtp/ssmtp.conf && \
-  chmod +x /usr/local/bin/update_ssmtp.sh /usr/local/bin/start.sh && \
+RUN chmod +x /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

@@ -4,9 +4,11 @@ Dockerfile for LedgerSMB Docker image
 
 # Supported tags
 
-- `1.6`, `1.6.x`, `latest` - Latest official release from 1.6 branch 
-- `1.5`, `1.5.x` - Latest official release from 1.5 branch
-- `1.4`, `1.4.x` - Latest tagged release of git 1.4 branch
+- `1.8`, `1.8.x`, `latest` - Latest official release from the 1.8 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.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
@@ -27,9 +29,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 not recommend exposing this port publicly, because
+do recommend not exposing this port publicly, because
 
-1. The Starman author recommends it
+1. The Starman author recommends not exposing it
 2. We strongly recommend TLS encryption of all application traffic
 
 While the exposed port can be used for quick evaluation, it's recommended
@@ -41,7 +43,7 @@ could require additional setup of a mail service or CUPS printer service.
 # How to use this image
 
 This image can be installed either automatically with the Docker compose file
-manually with docker only.
+or manually with docker only.
 
 ## Docker-Compose installation and start
 
@@ -56,49 +58,47 @@ variables, are:
  $ docker-compose up
 ```
 
+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 database username and password are:
+
+```plain
+   username: postgres
+   password: abc
+```
+
+From here, follow the steps as detailed in the instructions for
+[preparing for first use](https://ledgersmb.org/content/preparing-ledgersmb-17-first-use).
 
 ## Manual installation
 
-### Start a postgres instance
-
-```plain
- $ docker run -d --name postgres \
-              -e POSTGRES_PASSWORD=mysecretpassword \
-              postgres:latest
-```
-
-BEWARE: The command above creates a container with the database data stored
-*inside* the container. Upon removal of the container, the database data will
-be removed too!
-
-To prevent destruction of the database data upon replacement of the container,
-please use these commands instead:
-
-```plain
- $ docker volume create dbdata
- $ docker run -d --name postgres \
-              -e POSTGRES_PASSWORD=mysecretpassword \
-              -e PGDATA=/var/lib/postgresql/data/pgdata \
-              -v dbdata:/var/lib/postgresql/data \
-              postgres:latest
-```
+This section assumes availability of a PostgreSQL server to attach to the
+LedgerSMB image as the database server.
 
 ### Start LedgerSMB
 
 ```plain
  $ docker run -d -p 5762:5762 --name myledger \
-              ledgersmb/ledgersmb:latest
+              -e POSTGRES_HOST=<ip/hostname> ledgersmb/ledgersmb:latest
 ```
 
 This command maps port 5762 of your container to port 5762 in your host. The
 web application inside the container should now be accessible through
-http://localhost:5762/setup.pl.
+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
 
  * Visit http://myledger:5762/setup.pl.
- * Log in with the "postgres" user and the password `mysecretpassword`
-   and provide the name of a company (= database name) you want to create.
+ * Log in with the "postgres" user and the password `abc` as given above -
+   or with the credentials of your own database server in case of a manual
+   setup - and provide the name of a company (= database name) you want to
+   create.
  * Go over the steps presented in the browser
 
 Once you have completed the setup steps, you have a fully functional
@@ -148,19 +148,18 @@ affect the performance experience of users.
 
 ## Mail configuration
 
-* `SSMTP_ROOT` (config: `Root`)
+### 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`)
-* `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_AUTH_METHOD` (config: `AuthMethod` -- DEPRECATED)
+* `SSMTP_FROMLINE_OVERRIDE` (config: `FromLineOverride` -- DEPRECATED)
 
 `SSMTP_MAILHUB` defaults to the default docker0 interface, so if your host is
 already configured to relay mail, this should relay successfully with only
@@ -171,6 +170,25 @@ Use the [ssmtp.conf man
 page](https://www.systutorials.com/docs/linux/man/5-ssmtp.conf/) to look up
 the meaning and function of each of the mail configuration keys.
 
+### 1.8.0 and higher (under development)
+
+As of 1.8.0, the image is based on Debian Buster instead of Debian Stretch;
+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`
+
+
+
 # Troubleshooting/Developing
 
 Currently the LedgerSMB installation is in /srv/ledgersmb
@@ -181,11 +199,18 @@ and the startup & config script is /usr/bin/start.sh.
 
 ## Issues
 
-If you have any problems with or questions about this image or LedgerSMB, please contact us on the [mailing list](http://ledgersmb.org/topic/support/mailing-lists-rss-and-nntp-feeds) or through a [GitHub issue](https://github.com/ledgersmb/ledgersmb-docker/issues).
+If you have any problems with or questions about this image or LedgerSMB,
+please contact us on the [mailing list](http://ledgersmb.org/topic/support/mailing-lists-rss-and-nntp-feeds)
+or through a [GitHub issue](https://github.com/ledgersmb/ledgersmb-docker/issues).
 
-You can also reach some of the official LedgerSMB maintainers via the `#ledgersmb` IRC channel on [Freenode](https://freenode.net), or on the bridged [Matrix](https://matrix.org) room in [#ledgersmb:matrix.org](https://matrix.to/#/#ledgersmb:matrix.org). The [Riot.im](https://riot.im/app/#/room/#ledgersmb:matrix.org) Matrix client is highly recommended.
+You can also reach some of the official LedgerSMB maintainers via the
+`#ledgersmb` IRC channel on [Freenode](https://freenode.net), or on the
+bridged [Matrix](https://matrix.org) room in [#ledgersmb:matrix.org](https://matrix.to/#/#ledgersmb:matrix.org).
+The [Riot.im](https://riot.im/app/#/room/#ledgersmb:matrix.org) Matrix client is highly recommended.
 
 
 ## Contributing
 
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+You are invited to contribute new features, fixes, or updates, large or small;
+we are always thrilled to receive pull requests, and do our best to process
+them as fast as we can.

docker-compose.yml

@@ -28,18 +28,18 @@ services:
   lsmb:
     depends_on:
       - postgres
-    image: ledgersmb/ledgersmb:1.6
+    image: ledgersmb/ledgersmb:1.8
     networks:
       - internal
       - default
-    # Uncomment the 'ports' section to map the LedgerSMB container port (5762)
+    # Comment the 'ports' section to disable mapping 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:
-    #   - "5762:5762"
+    ports:
+      - "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,36 +1,105 @@
 #!/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]
-sendmail   = /usr/sbin/ssmtp
-
+${LSMB_MAIL_SMTPHOST:+smtphost=$LSMB_MAIL_SMTPHOST
+}${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
 
-# Currently unmaintained/untested
-# if [ ! -z ${CREATE_DATABASE+x} ]; then
-#   perl tools/dbsetup.pl --company $CREATE_DATABASE \
-#   --host $POSTGRES_HOST \
-#   --postgres_password "$POSTGRES_PASS"
-#fi
-
 # start ledgersmb
 # --preload-app allows application initialization to kill the entire
 # starman instance (instead of just the worker, which will immediately
-# get restarted); it also has a positive effect on memory use
+# get restarted) on error; it also has a positive effect on memory use
 
-exec starman --port 5762 --workers ${LSMB_WORKERS:-5} -I lib -I old/lib \
+echo '--------- LEDGERSMB CONFIGURATION:  ledgersmb.conf'
+cat ${LSMB_CONFIG_FILE:-ledgersmb.conf}
+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

@@ -1,18 +0,0 @@
-#!/bin/bash
-ConfiguredComment='# install script update_ssmtp.sh has configured ssmtp'
-grep -qc "$ConfiguredComment" /etc/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