Compare commits

...

4 Commits
1.4.28 ... 1.3

Author SHA1 Message Date
John Locke
5cbc5e6f7f Fix grep flag 2015-11-19 12:01:08 -08:00
John Locke
a3409267f4 Patch from dcg: detect /etc/ssmtp.conf changes inside update script, instead of touching a /tmp file 2015-11-19 11:59:47 -08:00
John Locke
b66d8bbfee Update readme for versions built 2015-08-01 10:11:12 -07:00
John Locke
503569f472 Create 1.3 branch 2015-08-01 10:06:49 -07:00
4 changed files with 9 additions and 9 deletions

View File

@@ -2,7 +2,7 @@ FROM debian:jessie
MAINTAINER Freelock john@freelock.com
# Build time variables
ENV LSMB_VERSION 1.4
ENV LSMB_VERSION 1.3
# Install Perl, Tex, Starman, psql client, and all dependencies

View File

@@ -7,8 +7,7 @@ This is a work in progress to make a docker image for running LedgerSMB. It shou
- `1.5`, `dev-master` - Master branch, unstable
- `1.4`, `latest` - Tip of git 1.4 branch
- `1.4.12` - Latest stable release (not yet built)
- `1.3.45` - Last 1.3.x release (not yet built)
- `1.3` - Latest 1.3.x release
# What is LedgerSMB?

View File

@@ -1,11 +1,6 @@
#!/bin/bash
if [[ -e /tmp/smtpconfig ]]; then
echo "smtp configured."
else
update_ssmtp.sh
touch /tmp/smtpconfig
fi
update_ssmtp.sh
if [[ ! -f ledgersmb.conf ]]; then

View File

@@ -1,4 +1,9 @@
#!/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" \
@@ -10,3 +15,4 @@ sed -i \
[ -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