From 213980a3d1db37cd395877492c669d449547942c Mon Sep 17 00:00:00 2001 From: pierreozoux <pierre@ozoux.net> Date: Mon, 12 Jan 2015 23:15:35 +0100 Subject: [PATCH] Uses systemd-docker --- unit-files/lamp@.service | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/unit-files/lamp@.service b/unit-files/lamp@.service index 038e7c4..53b7d8f 100644 --- a/unit-files/lamp@.service +++ b/unit-files/lamp@.service @@ -17,7 +17,11 @@ Before=backup@%i.timer [Service] Restart=always +Type=notify +NotifyAccess=all EnvironmentFile=/data/domains/%i/.env +Environment=URL=%i +ExecStartPre=/usr/bin/docker run --rm -v /opt/bin:/opt/bin ibuildthecloud/systemd-docker ExecStartPre=-/usr/bin/docker kill %i ExecStartPre=-/usr/bin/docker rm %i ExecStartPre=/bin/bash -euxc ' \ @@ -28,17 +32,14 @@ ExecStartPre=/bin/bash -euxc ' \ fi; \ cat /data/domains/%i/mysql/.env | sed s/MYSQL_PASS/DB_PASS/ > $application_folder/.env' -ExecStart=/usr/bin/docker run \ +ExecStart=/opt/bin/systemd-docker --env run \ --name %i \ --link mysql-%i:db \ -v /data/domains/%i/${APPLICATION}/data:${VOLUME} \ -v /data/domains/%i/${APPLICATION}/.htaccess:/app/.htaccess \ --env-file /data/domains/%i/${APPLICATION}/.env \ pierreozoux/${APPLICATION} -ExecReload=/bin/bash -euxc ' \ - /usr/bin/docker restart %i; \ - systemctl restart discovery@%i.service; \ - systemctl restart backup@%i.timer;' +ExecReload=/usr/bin/docker restart %i ExecStop=/bin/bash -euxc ' \ systemctl stop discovery@%i.service; \ -- GitLab