From d22a4d4dfe060f1bda2f8dbf3ad54fb14f40f74b Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Thu, 2 Jan 2020 08:24:07 -0800
Subject: [PATCH] Release 1.2.1 - See CHANGELOG.md

---
 CHANGELOG.md                          | 6 ++++++
 install/etc/cont-init.d/10-postal     | 4 ++--
 install/etc/s6/services/10-postal/run | 8 +++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdbce94..593c8cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.2.1 2020-01-02 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Additional changes to support new tiredofit/alpine base image
+
+
 ## 1.2.0 2019-12-30 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/install/etc/cont-init.d/10-postal b/install/etc/cont-init.d/10-postal
index ece8d84..f0e618f 100755
--- a/install/etc/cont-init.d/10-postal
+++ b/install/etc/cont-init.d/10-postal
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv /bin/bash
 
-source /assets/functions/*
+for s in /assets/functions/*; do source $s; done
 PROCESS_NAME="postal"
 
 ### Set Defaults
@@ -59,7 +59,7 @@ fi
 ### SSL Configuration
 if [ "$SMTP_SERVER_ENABLE_TLS" = "true" ];  then 
   if [ ! -f "/opt/postal/certs/$SMTP_SERVER_TLS_CERT" ] || [ ! -f "/opt/postal/certs/$SMTP_SERVER_TLS_KEY" ]; then
-      print_warn "** [psotal] TLS Key or certificate not found. Generating self-signed certificates"
+      print_warn "TLS Key or certificate not found. Generating self-signed certificates"
       cat <<EOF > /tmp/openssl.cnf
 [ req ]
 default_bits = 2048
diff --git a/install/etc/s6/services/10-postal/run b/install/etc/s6/services/10-postal/run
index 4fd0ad0..de5a585 100755
--- a/install/etc/s6/services/10-postal/run
+++ b/install/etc/s6/services/10-postal/run
@@ -1,8 +1,10 @@
 #!/usr/bin/with-contenv bash
 
-source /assets/functions/*
-PROCESS_NAME="postal"
-check_initialized
+for s in /assets/functions/*; do source $s; done
+PROCESS_NAME="nginx"
+
+check_container_initialized
+check_service_initialized init
 liftoff
 
 print_info "Starting postal"