Skip to content
This repository has been archived by the owner on Aug 16, 2019. It is now read-only.

Commit

Permalink
Clarify docs and resolve one warning
Browse files Browse the repository at this point in the history
  • Loading branch information
raymondEhlers committed Oct 18, 2018
1 parent ead0b5b commit e207c10
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions docker/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ childlogdir = exec/logs
# 5 MB log file with 10 backup files
logfile_maxbytes = 5000000
logfile_backups = 10
# We always run as root in docker, which causes supervisor to throw an error. It is silenced by
# telling it that we explicitly are intended to run as root.
user = root

# the below section must remain in the config file for RPC
# (supervisorctl/web interface) to work, additional interfaces may be
Expand Down
1 change: 0 additions & 1 deletion overwatch/base/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,6 @@ def setup(self):
# Create an underlying uwsgi app to handle the setup and execution.
if "nginx" in self.config:
if self.config["nginx"].get("enabled", False) is True:
# TODO: Either pass the http or unix socket
self.nginx = nginx(self.config["nginx"])
self.nginx.run()

Expand Down
2 changes: 2 additions & 0 deletions overwatch/base/deployReference.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,13 @@ executables:
enabled: false
# Module path of the web app.
module: "overwatch.webApp.run"
# Must specify either a http-socket or a uwsgi-socket.
nginx:
<<: *nginxOptions
enabled: false
# Name of the web app
webAppName: "webApp"
# NOTE: If this is working with uwsgi, wsgi-socket should be set to "/tmp/sockets/{webAppName}.sock"!

# Additional options to be passed into the Overwatch config. Any entries should be valid
# Overwatch config YAML. It will be stored in the user `config.yaml`.
Expand Down

0 comments on commit e207c10

Please sign in to comment.