From 52870f2be2f1c4efa3368492ed525fc8c0d5bd4c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 20 Jan 2016 20:37:15 +0100 Subject: [PATCH] mv install scripts --- init.sh.example => app/deploy/init.sh.example | 0 .../deploy/install_linux_systemd.py | 12 +++++++----- .../deploy/install_linux_sysvinit.py | 4 ++-- 3 files changed, 9 insertions(+), 7 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..037f3b6e 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, conf, program, conf) # 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 + '...' -- 2.39.5