Merge pull request #419 from continuouspipe/hotfix/do-not-override-start-cron

Do not overwrite the `START_CRON` variable if already exists

Author: sroze

php/shared/usr/local/share/env/40-stack

@@ -18,7 +18,7 @@ export APP_GROUP=${APP_GROUP:-www-data}
 export START_MODE=${START_MODE:-web}
 declare "START_MODE_${START_MODE^^}=true"
 
-START_CRON="$(convert_to_boolean_string "${START_MODE_CRON:-false}")"
+START_CRON="$(convert_to_boolean_string "${START_CRON:-${START_MODE_CRON:-false}}")"
 export START_CRON
 
 APP_ENDPOINT_REWRITE="$(convert_to_boolean_string "${APP_ENDPOINT_REWRITE-true}")"

ubuntu/16.04/etc/confd/templates/supervisor/cron.conf.tmpl

@@ -5,8 +5,9 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 loglevel = warn
+{{ if not (eq "true" (getenv "NON_PRIVILEGED_USER")) }}
 user = root
+{{ end }}
 autostart = {{ getenv "START_CRON" }}
 autorestart = true
 priority = 5
-