diff --git a/Dockerfile b/Dockerfile index 4c31b54..14ace77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,11 @@ RUN crontab -u znc /tmp/crontab RUN rm /tmp/crontab # Install startup stuff -COPY daemons.conf /etc/supervisor/conf.d/daemons.conf +COPY supervisor.conf /etc/supervisor/conf.d/supervisor.conf +COPY nginx.conf /etc/supervisor/conf.d/nginx.conf +COPY cron.conf /etc/supervisor/conf.d/cron.conf +COPY znc.conf /etc/supervisor/conf.d/znc.conf +COPY sshd.conf /etc/supervisor/conf.d/sshd.conf COPY start /start RUN chmod +x /start @@ -40,3 +44,4 @@ RUN chmod +x /start EXPOSE 22 # nginx EXPOSE 80 + diff --git a/cron.conf b/cron.conf new file mode 100644 index 0000000..3b2d683 --- /dev/null +++ b/cron.conf @@ -0,0 +1,4 @@ +[program:cron] +command=/usr/sbin/cron -f +autorestart=true + diff --git a/daemons.conf b/daemons.conf deleted file mode 100644 index a957428..0000000 --- a/daemons.conf +++ /dev/null @@ -1,19 +0,0 @@ -[supervisord] -nodaemon=true - -[program:sshd] -command=/usr/sbin/sshd -D -autorestart=true - -[program:znc] -command=su -c "/usr/bin/znc --foreground" znc -autorestart=true - -[program:cron] -command=/usr/sbin/cron -f -autorestart=true - -[program:nginx] -command=/usr/sbin/nginx -autorestart=true - diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..eb73b43 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,4 @@ +[program:nginx] +command=/usr/sbin/nginx +autorestart=true + diff --git a/sshd.conf b/sshd.conf new file mode 100644 index 0000000..3ae0dda --- /dev/null +++ b/sshd.conf @@ -0,0 +1,4 @@ +[program:sshd] +command=/usr/sbin/sshd -D +autorestart=true + diff --git a/supervisor.conf b/supervisor.conf new file mode 100644 index 0000000..3fb016d --- /dev/null +++ b/supervisor.conf @@ -0,0 +1,3 @@ +[supervisord] +nodaemon=true + diff --git a/znc.conf b/znc.conf new file mode 100644 index 0000000..960a493 --- /dev/null +++ b/znc.conf @@ -0,0 +1,4 @@ +[program:znc] +command=su -c "/usr/bin/znc --foreground" znc +autorestart=true +