Remove ssh, general improvements

Dockerfile

@@ -19,11 +19,13 @@ RUN apt-get update ; \
     chmod +x /run_deluge.sh
 
 # Install SSH server
-RUN mkdir /var/run/sshd ; \
+#RUN mkdir /var/run/sshd ; \
-    apt-get -y install openssh-server
+#    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 ; \

deluged.conf

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

start

@@ -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
-

supervisord.conf

@@ -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
-

vnstatd.conf

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