Commit 2fcdddfb by John Jarvis

updating supervisor role so that it takes a bind port for the http

interface
parent 83b857ab
---
dependencies:
- role: supervisor
supervisor_app_dir: $devpi_supervisor_app_dir
supervisor_data_dir: $devpi_supervisor_data_dir
supervisor_log_dir: $devpi_supervisor_log_dir
supervisor_venv_dir: $devpi_supervisor_venv_dir
supervisor_service_user: $devpi_supervisor_user
supervisor_app_dir: "{{ devpi_supervisor_app_dir }}"
supervisor_data_dir: "{{ devpi_supervisor_data_dir }}"
supervisor_log_dir: "{{ devpi_supervisor_log_dir }}"
supervisor_venv_dir: "{{ devpi_supervisor_venv_dir }}"
supervisor_service_user: "{{ devpi_supervisor_user }}"
supervisor_service: "supervisor.devpi"
supervisor_http_port: '127.0.0.1:9002'
supervisor_http_bind_port: '9002'
......@@ -11,6 +11,12 @@
# Defaults for role supervisor
#
---
SUPERVISOR_HTTP_BIND_IP: '127.0.0.1'
# do not override the bind_port since
# all supervisors will then try to listen
# on the same one
supervisor_http_bind_port: '9001'
supervisor_app_dir: "{{ COMMON_APP_DIR }}/supervisor"
supervisor_cfg_dir: "{{ supervisor_app_dir }}/conf.d"
supervisor_data_dir: "{{ COMMON_DATA_DIR }}/supervisor"
......@@ -18,7 +24,6 @@ supervisor_venvs_dir: "{{ supervisor_app_dir }}/venvs"
supervisor_venv_dir: "{{ supervisor_venvs_dir }}/supervisor"
supervisor_venv_bin: "{{ supervisor_venv_dir }}/bin"
supervisor_ctl: "{{ supervisor_venv_bin }}/supervisorctl"
supervisor_http_port: '127.0.0.1:9001'
# by default supervisor runs as the web user
# which by default is set to www-data in
......
......@@ -25,7 +25,7 @@ serverurl=unix://{{ supervisor_data_dir }}/supervisor.sock ; use a unix:// URL
; include files themselves.
[inet_http_server]
port = {{ supervisor_http_port }}
port = {{ SUPERVISOR_HTTP_BIND_IP }}:{{ supervisor_http_bind_port }}
[include]
files = {{ supervisor_cfg_dir }}/*.conf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment