Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade supervisord to 3.3.3 and fix supervisord.conf #1390

Merged
merged 22 commits into from
Feb 14, 2018
Merged

Upgrade supervisord to 3.3.3 and fix supervisord.conf #1390

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0766365
IPv4 prefixes shouldn't be sent by default over IPv6 session with FRR.
Aug 22, 2017
45ab087
RR client support in minigraph for FRR
Aug 27, 2017
c9a2c92
Sync to master
Aug 27, 2017
38a8261
Revert "Sync to master"
Aug 29, 2017
9c69587
Revert "RR client support in minigraph for FRR"
Aug 29, 2017
99300a5
Merge pull request #3 from Azure/master
nikos-github Aug 29, 2017
8aa3ef5
RR client support in minigraph for FRR
Aug 29, 2017
6e2ef2c
Correcting j2 file for rrclient support
Aug 31, 2017
557bb08
Sync to master
nikos-github Oct 4, 2017
bf4d3c3
Merge pull request #4 from Azure/master
nikos-github Oct 4, 2017
745b96d
Remove stale files from sync
nikos-github Oct 4, 2017
adea1da
Fix python warning from previous rrclient commit.
Oct 9, 2017
cc133ea
Fix python warning from previous rrclient commit and move config hand…
Oct 9, 2017
d1e05d8
Fix python warning from previous rrclient commit and move config hand…
Oct 10, 2017
f1eb735
Sync to master
Nov 7, 2017
4a1c7a0
Merge pull request #5 from Azure/master
nikos-github Nov 7, 2017
54e176f
Auto-completion, help (?), cmd navigation (up arrow) not working in v…
Nov 7, 2017
58082cd
Update sonic-quagga submodule
Nov 10, 2017
5707b61
Merge pull request #6 from Azure/master
nikos-github Jan 30, 2018
15a0dd7
Upgrade supervisord to 3.3.3 and fix supervisord.conf
Feb 12, 2018
b680877
Upgrade supervisord to 3.3.3 and fix supervisord.conf
Feb 12, 2018
cf68da9
Upgrade supervisord to 3.3.3 and fix supervisord.conf
Feb 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions dockers/docker-base/etc/supervisor/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
username=nobody
password=nobody

[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
user=root

; the below section must remain in the config file for RPC
; (supervisorctl/web interface) to work, additional interfaces may be
Expand All @@ -17,6 +20,8 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username=nobody
password=nobody
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this mean we need to type username and password for supervisorctl command line? is that necessary?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from your commit message, you are trying to address http server accessing issue, so I am not sure if we need to add username/password for the supervisorctl command line as well. Since once you can get into the docker, you already have sudo privilege, adding extra user/pass protection does not seem necessary.


; The [include] section can just contain the "files" setting. This
; setting can list multiple files (separated by whitespace or
Expand Down
2 changes: 1 addition & 1 deletion rules/supervisor.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# supervisor package

SUPERVISOR_VERSION = 3.3.2
SUPERVISOR_VERSION = 3.3.3

export SUPERVISOR_VERSION

Expand Down