Add harvest configs and supervisorctl

ckan-backend-dev/ckan/Dockerfile.dev

@@ -123,4 +123,10 @@ RUN ckan config-tool ${CKAN_INI} "ckan.root_path = /private-admin/{{LANG}}"
 
 COPY setup/who.ini ${APP_DIR}/src/ckan/who.ini
 
+COPY setup/supervisord.conf /etc/supervisord.d/supervisord.conf
+COPY setup/supervisor.worker.conf /etc/supervisord.d/worker.conf
+COPY setup/supervisor.harvest.conf /etc/supervisord.d/harvest.conf
+
+RUN chown -R ckan:ckan /etc/supervisord.d
+
 CMD ["sh", "-c", "${APP_DIR}/start_ckan_development.sh"]

ckan-backend-dev/ckan/setup/start_ckan_development.sh.override

@@ -94,7 +94,7 @@ then
 fi
 
 # Start supervisord
-supervisord --configuration /etc/supervisord.conf &
+supervisord --configuration /etc/supervisord.d/supervisord.conf &
 
 # Start the development server with automatic reload
 ckan -c $CKAN_INI run -H 0.0.0.0 --prefix /private-admin

ckan-backend-dev/ckan/setup/supervisor.harvest.conf

@@ -0,0 +1,26 @@
+[program:ckan-fetch]
+command=ckan -c /srv/app/production.ini harvester fetch-consumer
+priority=501
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+user=ckan
+environment=HOME="/srv/app",USER="ckan"
+
+
+[program:ckan-gather]
+command=ckan -c /srv/app/production.ini harvester gather-consumer
+priority=501
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+user=ckan
+environment=HOME="/srv/app",USER="ckan"

ckan-backend-dev/ckan/setup/supervisor.worker.conf

@@ -0,0 +1,12 @@
+[program:ckan-worker]
+command=ckan -c /srv/app/production.ini jobs worker 
+priority=501
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+user=ckan
+environment=HOME="/srv/app",USER="ckan"

ckan-backend-dev/ckan/setup/supervisord.conf

@@ -0,0 +1,23 @@
+[unix_http_server]
+file = /tmp/supervisor.sock
+chmod = 0777
+chown = ckan:ckan
+
+[supervisord]
+logfile = /tmp/supervisord.log
+logfile_maxbytes = 50MB
+logfile_backups=10
+loglevel = info
+pidfile = /tmp/supervisord.pid
+nodaemon = true
+umask = 022
+identifier = supervisor
+
+[supervisorctl]
+serverurl = unix:///tmp/supervisor.sock
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[include]
+files = /etc/supervisord.d/*.conf

deployment/ckan/Dockerfile

@@ -81,5 +81,11 @@ USER root
 
 RUN chown -R ckan:ckan ${APP_DIR}/src/
 
+COPY setup/supervisord.conf /etc/supervisord.d/supervisord.conf
+COPY setup/supervisor.worker.conf /etc/supervisord.d/worker.conf
+COPY setup/supervisor.harvest.conf /etc/supervisord.d/harvest.conf
+
+RUN chown -R ckan:ckan /etc/supervisord.d
+
 USER ckan
 

deployment/ckan/setup/start_ckan.sh.override

@@ -39,7 +39,7 @@ export SCRIPT_NAME="/private-admin"
 if [ $? -eq 0 ]
 then
     # Start supervisord
-    supervisord --configuration /etc/supervisord.conf &
+    supervisord --configuration /etc/supervisord.d/supervisord.conf &
     # Start uwsgi
     uwsgi $UWSGI_OPTS
 else

deployment/ckan/setup/start_ckan_development.sh.override

@@ -93,7 +93,7 @@ then
 fi
 
 # Start supervisord
-supervisord --configuration /etc/supervisord.conf &
+supervisord --configuration /etc/supervisord.d/supervisord.conf &
 
 # Start the development server with automatic reload
 sudo -u ckan -EH ckan -c $CKAN_INI run -H 0.0.0.0 --prefix /private-admin

deployment/ckan/setup/supervisor.harvest.conf

@@ -0,0 +1,26 @@
+[program:ckan-fetch]
+command=ckan -c /srv/app/production.ini harvester fetch-consumer
+priority=501
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+user=ckan
+environment=HOME="/srv/app",USER="ckan"
+
+
+[program:ckan-gather]
+command=ckan -c /srv/app/production.ini harvester gather-consumer
+priority=501
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+user=ckan
+environment=HOME="/srv/app",USER="ckan"

deployment/ckan/setup/supervisor.worker.conf

@@ -0,0 +1,12 @@
+[program:ckan-worker]
+command=ckan -c /srv/app/production.ini jobs worker 
+priority=501
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+user=ckan
+environment=HOME="/srv/app",USER="ckan"

deployment/ckan/setup/supervisord.conf

@@ -0,0 +1,23 @@
+[unix_http_server]
+file = /tmp/supervisor.sock
+chmod = 0777
+chown = ckan:ckan
+
+[supervisord]
+logfile = /tmp/supervisord.log
+logfile_maxbytes = 50MB
+logfile_backups=10
+loglevel = info
+pidfile = /tmp/supervisord.pid
+nodaemon = true
+umask = 022
+identifier = supervisor
+
+[supervisorctl]
+serverurl = unix:///tmp/supervisor.sock
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[include]
+files = /etc/supervisord.d/*.conf