From f053cb6c4219e928e68c3d3224fdd85b30db4bed Mon Sep 17 00:00:00 2001
From: Kristian Haugene <kristian.haugene@capgemini.com>
Date: Thu, 7 May 2015 21:34:34 +0200
Subject: [PATCH] enhanced a few things. running plain ubuntu, openvpn starts
 transmission when connection is establised and so on

---
 Dockerfile            | 22 ++++++----------------
 piaconfig/config.ovpn |  5 ++++-
 transmission/down.sh  |  3 +++
 transmission/run.sh   |  8 ++++++--
 4 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100755 transmission/down.sh

diff --git a/Dockerfile b/Dockerfile
index d6e33ab..7770d40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 #
 # Version 0.9
 
-FROM phusion/baseimage:0.9.15
+FROM ubuntu:14.04
 MAINTAINER Kristian Haugene
 
 VOLUME /data
@@ -21,19 +21,6 @@ RUN apt-get install -y transmission-common
 RUN apt-get install -y transmission-daemon
 RUN apt-get install -y openvpn
 RUN apt-get install -y curl
-RUN apt-get install -y screen
-
-# Transmission service
-RUN mkdir -p /etc/service/transmission/
-ADD transmission/run.sh /etc/service/transmission/run
-
-# Transmission port updater
-RUN mkdir -p /etc/service/portupdater/
-ADD transmission/runUpdates.sh /etc/service/portupdater/run
-
-# OpenVPN service
-RUN mkdir -p /etc/service/openvpn/
-ADD runOpenVpn.sh /etc/service/openvpn/run
 
 VOLUME /config
 
@@ -41,14 +28,17 @@ VOLUME /config
 ADD piaconfig/config.ovpn /etc/openvpn/config.ovpn
 ADD piaconfig/ca.crt /etc/openvpn/ca.crt
 ADD piaconfig/crl.pem /etc/openvpn/crl.pem
-ADD runOpenVpn.sh /etc/openvpn/start.sh
 ADD transmission/defaultSettings.json /etc/transmission-daemon/settings.json
 ADD transmission/updateTransmissionPort.sh /etc/transmission-daemon/updatePort.sh
 ADD transmission/periodicUpdates.sh /etc/transmission-daemon/periodicUpdates.sh
+ADD transmission/run.sh /etc/transmission-daemon/start.sh
+ADD transmission/runUpdates.sh /etc/transmission-daemon/startPortUpdates.sh
+ADD transmission/down.sh /etc/transmission-daemon/stop.sh
+ADD runOpenVpn.sh /etc/openvpn/start.sh
 
 # Expose port and run. Use baseimage-docker's init system
 EXPOSE 9091
-CMD ["/sbin/my_init"]
+CMD ["/etc/openvpn/start.sh"]
 
 # Clean up APT when done.
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/piaconfig/config.ovpn b/piaconfig/config.ovpn
index 0529277..c3f8b06 100644
--- a/piaconfig/config.ovpn
+++ b/piaconfig/config.ovpn
@@ -15,4 +15,7 @@ verb 1
 reneg-sec 0
 crl-verify /etc/openvpn/crl.pem
 
-
+# OpenVPN control startup and shut down of transmission
+script-security 2
+up /etc/transmission-daemon/start.sh
+down /etc/transmission-daemon/stop.sh
diff --git a/transmission/down.sh b/transmission/down.sh
new file mode 100755
index 0000000..0f9c4f4
--- /dev/null
+++ b/transmission/down.sh
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+kill $(ps aux | grep transmission-daemon | grep -v grep | awk '{print $2}')
diff --git a/transmission/run.sh b/transmission/run.sh
index 0853b83..09bf33f 100755
--- a/transmission/run.sh
+++ b/transmission/run.sh
@@ -3,8 +3,12 @@
 if [ -f /config/transmission/settings.json ];
 then
    echo "STARTING TRANSMISSION: Using custom config directory /config/transmission"
-   exec /usr/bin/transmission-daemon -f -g /config/transmission/
+   exec /usr/bin/transmission-daemon -g /config/transmission/ &
 else
    echo "STARTING TRANSMISSION: No configuration provided, using defaults"
-   exec /usr/bin/transmission-daemon -f -g /etc/transmission-daemon/
+   exec /usr/bin/transmission-daemon -g /etc/transmission-daemon/ &
 fi
+
+exec /etc/transmission-daemon/startPortUpdates.sh &
+
+echo "STARTED PORT UPDATER"