diff options
| author | Chris Church <chris@ninemoreminutes.com> | 2013-07-16 07:39:17 +0200 |
|---|---|---|
| committer | Chris Church <chris@ninemoreminutes.com> | 2013-07-16 07:39:17 +0200 |
| commit | c5f2f2bfafee980f956817503e40c70f37c64cab (patch) | |
| tree | 51e080eec2882be104e0c42f31f95edabc669bbe /config | |
| parent | Smarter removal of host/group associations means running the inventory script... (diff) | |
| download | awx-c5f2f2bfafee980f956817503e40c70f37c64cab.tar.xz awx-c5f2f2bfafee980f956817503e40c70f37c64cab.zip | |
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.
Diffstat (limited to 'config')
| -rw-r--r-- | config/awx_supervisor.conf | 2 | ||||
| -rw-r--r-- | config/deb/settings.py | 3 | ||||
| -rw-r--r-- | config/rpm/settings.py | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/config/awx_supervisor.conf b/config/awx_supervisor.conf index bf5cfe746a..f81156f1d0 100644 --- a/config/awx_supervisor.conf +++ b/config/awx_supervisor.conf @@ -10,5 +10,3 @@ directory = /var/lib/awx log_stderr = true logfile_maxbytes = 50MB logfile_backups = 999 -environment=HOME=/var/lib/awx/,USER=awx - diff --git a/config/deb/settings.py b/config/deb/settings.py index f1f58153c4..50ac050710 100644 --- a/config/deb/settings.py +++ b/config/deb/settings.py @@ -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] ' diff --git a/config/rpm/settings.py b/config/rpm/settings.py index f1f58153c4..50ac050710 100644 --- a/config/rpm/settings.py +++ b/config/rpm/settings.py @@ -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] ' |