From 2de94bd4bd1c41b257613c8f15656ea058fc6ed1 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 20 Jan 2016 20:26:56 +0100
Subject: [PATCH] move install scripts and simplify systemd script

---
 init.sh.example => app/deploy/init.sh.example        |  0
 .../deploy/install_linux_systemd.py                  | 12 +++++++-----
 .../deploy/install_linux_sysvinit.py                 |  4 ++--
 app/deploy/start_app.sh                              |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename init.sh.example => app/deploy/init.sh.example (100%)
 rename install_linux_systemd.py => app/deploy/install_linux_systemd.py (67%)
 rename install_linux_sysvinit.py => app/deploy/install_linux_sysvinit.py (91%)

diff --git a/init.sh.example b/app/deploy/init.sh.example
similarity index 100%
rename from init.sh.example
rename to app/deploy/init.sh.example
diff --git a/install_linux_systemd.py b/app/deploy/install_linux_systemd.py
similarity index 67%
rename from install_linux_systemd.py
rename to app/deploy/install_linux_systemd.py
index d6d0d1dc..756f616e 100755
--- a/install_linux_systemd.py
+++ b/app/deploy/install_linux_systemd.py
@@ -2,8 +2,10 @@
 
 import os
 
-path = os.getcwd()
-name = path.split(os.sep)[-1]
+path = os.sep.join(os.getcwd().split(os.sep)[:-2])
+name = path.split(os.sep)[-1].lower()
+conf = path + os.sep + 'docker-compose.yml'
+program = '/usr/local/bin/docker-compose'
 service = '/lib/systemd/system/' + name + '.service'
 
 print 'installing ' + name + '...'
@@ -19,12 +21,12 @@ Requires=docker.service
 After=docker.service
 
 [Service]
-ExecStart=/usr/local/bin/docker-compose -f %s/docker-compose.yml up -d
-ExecStop=/usr/local/bin/docker-compose -f %s/docker-compose.yml stop
+ExecStart=%s -f %s up -d
+ExecStop=%s -f %s stop
 
 [Install]
 WantedBy=local.target
-""" % (name, path, path)
+""" % (name, program, path, program, path)
 
 # print rules
 
diff --git a/install_linux_sysvinit.py b/app/deploy/install_linux_sysvinit.py
similarity index 91%
rename from install_linux_sysvinit.py
rename to app/deploy/install_linux_sysvinit.py
index 8c2cf178..da6a0885 100755
--- a/install_linux_sysvinit.py
+++ b/app/deploy/install_linux_sysvinit.py
@@ -2,10 +2,10 @@
 
 import os
 
-path = os.getcwd()
+path = os.sep.join(os.getcwd().split(os.sep)[:-2])
 name = path.split(os.sep)[-1].lower()
-service = '/etc/init.d/' + name
 conf = path + os.sep + 'docker-compose.yml'
+service = '/etc/init.d/' + name
 
 print 'installing ' + name + '...'
 
diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index bbe3d2d3..634c0ab2 100644
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -18,7 +18,7 @@ gid='www-data'
 # Staging
 #pip install mezzanine_instagram
 
-chown $uid:$gid $media
+chown -R $uid:$gid $media
 
 # waiting for other services
 sh $app/deploy/wait.sh
-- 
2.39.5