From c61323257ba3be23aebebe99eecfa3a2cc4aad3d Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 20 Apr 2023 20:27:35 +0500 Subject: [PATCH] Use the default supervisord configuration (#608) * Use a unix socket by default * Use the default supervisord configuration * Return the init.d supervisor file --- config/supervisor/supervisord.conf | 27 --------------------------- run-document-server.sh | 2 -- 2 files changed, 29 deletions(-) delete mode 100644 config/supervisor/supervisord.conf diff --git a/config/supervisor/supervisord.conf b/config/supervisor/supervisord.conf deleted file mode 100644 index 27ef634..0000000 --- a/config/supervisor/supervisord.conf +++ /dev/null @@ -1,27 +0,0 @@ -; supervisor config file - -[inet_http_server] -port = 127.0.0.1:9001 - -[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) - -; the below section must remain in the config file for RPC -; (supervisorctl/web interface) to work, additional interfaces may be -; added by defining them in separate rpcinterface: sections -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl = http://localhost:9001 ; use a unix:// URL for a unix socket - -; The [include] section can just contain the "files" setting. This -; setting can list multiple files (separated by whitespace or -; newlines). It can also contain wildcards. The filenames are -; interpreted as relative to this file. Included files *cannot* -; include files themselves. - -[include] -files = /etc/supervisor/conf.d/*.conf diff --git a/run-document-server.sh b/run-document-server.sh index c7235dc..ed7c665 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -494,8 +494,6 @@ update_nginx_settings(){ update_supervisor_settings(){ # Copy modified supervisor start script cp ${SYSCONF_TEMPLATES_DIR}/supervisor/supervisor /etc/init.d/ - # Copy modified supervisor config - cp ${SYSCONF_TEMPLATES_DIR}/supervisor/supervisord.conf /etc/supervisor/supervisord.conf sed "s/COMPANY_NAME/${COMPANY_NAME}/g" -i ${SYSCONF_TEMPLATES_DIR}/supervisor/ds/*.conf cp ${SYSCONF_TEMPLATES_DIR}/supervisor/ds/*.conf etc/supervisor/conf.d/ }