Merge branch 'master' into spf_dkim_postfix

Dockerfile

@@ -1,8 +1,9 @@
 FROM ubuntu:14.04
 MAINTAINER Thomas VIAL
 
-# Ensure that package operations will not produce warnings
 ENV DEBIAN_FRONTEND noninteractive
+ENV VIRUSMAILS_DELETE_DELAY=7
+ENV ONE_DIR=0
 
 # Packages
 RUN apt-get update -q --fix-missing && \

target/bin/virus-wiper

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-echo "Wipping virus older than $VIRUSMAILS_DELETE_DELAY days"
 find /var/lib/amavis/virusmails/ -type f -mtime +$VIRUSMAILS_DELETE_DELAY -delete

target/start-mailserver.sh

@@ -20,7 +20,6 @@ DEFAULT_VARS["POSTGREY_MAX_AGE"]="${POSTGREY_MAX_AGE:="35"}"
 DEFAULT_VARS["POSTGREY_TEXT"]="${POSTGREY_TEXT:="Delayed by postgrey"}"
 DEFAULT_VARS["ENABLE_SASLAUTHD"]="${ENABLE_SASLAUTHD:="0"}"
 DEFAULT_VARS["SMTP_ONLY"]="${SMTP_ONLY:="0"}"
-DEFAULT_VARS["VIRUSMAILS_DELETE_DELAY"]="${VIRUSMAILS_DELETE_DELAY:="7"}"
 DEFAULT_VARS["DMS_DEBUG"]="${DMS_DEBUG:="0"}"
 DEFAULT_VARS["OVERRIDE_HOSTNAME"]="${OVERRIDE_HOSTNAME}"
 ##########################################################################
@@ -122,6 +121,8 @@ function register_functions() {
 		_register_setup_function "_setup_postfix_virtual_transport"
 	fi
 
+    _register_setup_function "_setup_environment"
+
 	################### << setup funcs
 
 	################### >> fix funcs
@@ -909,6 +910,20 @@ function _setup_elk_forwarder() {
 		| sed "s@\$ELK_PORT@$ELK_PORT@g" \
 		> /etc/filebeat/filebeat.yml
 }
+
+function _setup_environment() {
+    notify 'task' 'Setting up /etc/environment'
+
+    local banner="# docker environment"
+    local var
+    if ! grep -q "$banner" /etc/environment; then
+        echo $banner >> /etc/environment
+        for var in "VIRUSMAILS_DELETE_DELAY"; do
+            echo "$var=${!var}" >> /etc/environment
+        done
+    fi
+}
+
 ##########################################################################
 # << Setup Stack
 ##########################################################################