Fix grep flag

Dockerfile

@@ -2,10 +2,10 @@ FROM        debian:jessie
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ENV LSMB_VERSION 1.4
+ENV LSMB_VERSION 1.3
 
 
-# Install PHP5 and modules along with composer binary
+# Install Perl, Tex, Starman, psql client, and all dependencies
 RUN DEBIAN_FRONTENT=noninteractive && \
   apt-get update && apt-get -y install \
   git \

README.md

@@ -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?
@@ -43,15 +42,17 @@ This image includes `EXPOSE 5432` (the postgres port), so standard container lin
 
 Visit http://myledger:5000/setup.pl (you can forward port 5000 to the host machine, or lookup the IP address for the "myledger" container if running on localhost)
 
-Log in with the "postgres" user and the password you set when starting up the Postgres container.
+Log in with the "postgres" user and the password you set when starting up the Postgres container, and provide the name of a company database you want to create.
 
 Once you have completed the setup, you have a fully functional LedgerSMB instance running!
 
-## Updating the LedgerSMB container
+Visit http://localhost:5000/login.pl to log in and get started.
+
+# Updating the LedgerSMB container
 
 No persistant data is stored in the LedgerSMB container. All LedgerSMB data is stored in Postgres, so you can stop/destroy/run a new LedgerSMB container, and as long as you link it to the Postgres database, you should be able to pick up where you left off.
 
-## Environment Variables
+# Environment Variables
 
 The LedgerSMB image uses several environment variables which are easy to miss. While none of the variables are required, they may significantly aid you in using the image.
 
@@ -102,6 +103,10 @@ If you have any problems with or questions about this image or LedgerSMB, please
 
 You can also reach some of the official LedgerSMB maintainers via the `#ledgersmb` IRC channel on [Freenode](https://freenode.net).
 
+1.4/latest: CREATE_DATABASE env variable currently does not provision a test company.
+
+1.5/dev-master: Currently no way to get a working database. Bugs are filed, blocking 3 different approaches: New database, Upgrade from 1.4, Test company
+
 ## 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.

start.sh

@@ -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
@@ -18,9 +13,10 @@ if [[ ! -f ledgersmb.conf ]]; then
 fi
 
 if [ ! -z ${CREATE_DATABASE+x} ]; then
-  perl tools/dbsetup.pl --company $CREATE_DATABASE \
+  perl tools/prepare-company-database.pl --company $CREATE_DATABASE \
   --host $POSTGRES_HOST \
-  --postgres_password "$POSTGRES_PASS"
+  --owner postgres \
+  --password "$POSTGRES_PASS"
 fi
 
 # start ledgersmb

update_ssmtp.sh

@@ -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