Remove ssh, general improvements

This commit is contained in:
dave 2015-03-20 20:24:23 -07:00
parent e93a180d9b
commit 860ff9cd0d
5 changed files with 19 additions and 20 deletions

View File

@ -19,11 +19,13 @@ RUN apt-get update ; \
chmod +x /run_deluge.sh
# Install SSH server
RUN mkdir /var/run/sshd ; \
apt-get -y install openssh-server
#RUN mkdir /var/run/sshd ; \
# apt-get -y install openssh-server
# Install supervisor, vnstat, & start script
RUN apt-get -y install supervisor vnstat
RUN apt-get -y install supervisor vnstat ; mkdir /start.d
COPY deluged.conf /etc/supervisor/conf.d/deluged.conf
COPY vnstatd.conf etc/supervisor/conf.d/vnstatd.conf
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY start /start
RUN chmod +x /start ; \

4
deluged.conf Normal file
View File

@ -0,0 +1,4 @@
[program:deluged]
autorestart=true
command=/run_deluge.sh

7
start Normal file → Executable file
View File

@ -1,5 +1,10 @@
#!/bin/bash
# run everything in start.d
find /start.d -type f -executable -exec {} \;
# Cleanly kill supervisor when container is stopped
trap 'kill $(jobs -p)' EXIT
# start services
supervisord

View File

@ -1,19 +1,3 @@
[supervisord]
nodaemon=true
[program:sshd]
command=/usr/sbin/sshd -D
autorestart=true
[program:deluged]
autorestart=true
command=/run_deluge.sh
[program:cron]
command=/usr/sbin/cron -f
autorestart=true
[program:vnstatd]
command=/bin/su -c '/usr/sbin/vnstatd -n' deluge
autorestart=true

4
vnstatd.conf Normal file
View File

@ -0,0 +1,4 @@
[program:vnstatd]
command=/bin/su -c '/usr/sbin/vnstatd -n' deluge
autorestart=true