Added support for defining additional environment variables in settings to pass to the subprocess launched by the celery task, specify HOME and USER in settings by default instead of supervisord configuration.

This commit is contained in:
Chris Church
2013-07-16 01:39:17 -04:00
parent 82a9572df8
commit c5f2f2bfaf
7 changed files with 39 additions and 9 deletions

View File

@@ -10,5 +10,3 @@ directory = /var/lib/awx
log_stderr = true
logfile_maxbytes = 50MB
logfile_backups = 999
environment=HOME=/var/lib/awx/,USER=awx

View File

@@ -42,6 +42,9 @@ LOGGING['handlers']['syslog'] = {
'formatter': 'simple',
}
AWX_TASK_ENV['HOME'] = '/var/lib/awx'
AWX_TASK_ENV['USER'] = 'awx'
SERVER_EMAIL = 'root@localhost'
DEFAULT_FROM_EMAIL = 'webmaster@localhost'
EMAIL_SUBJECT_PREFIX = '[AnsibleWorks] '

View File

@@ -42,6 +42,9 @@ LOGGING['handlers']['syslog'] = {
'formatter': 'simple',
}
AWX_TASK_ENV['HOME'] = '/var/lib/awx'
AWX_TASK_ENV['USER'] = 'awx'
SERVER_EMAIL = 'root@localhost'
DEFAULT_FROM_EMAIL = 'webmaster@localhost'
EMAIL_SUBJECT_PREFIX = '[AnsibleWorks] '