From 5a1e64217768b7d29bd725eafa8ec391db6f595e Mon Sep 17 00:00:00 2001 From: Kyle Manna Date: Sat, 11 Jul 2015 08:50:24 -0700 Subject: [PATCH] init: systemd: Use systemd style config overrides * RIP hacky /etc/default/foo style environement sourcing hack --- init/docker-openvpn@.service | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/init/docker-openvpn@.service b/init/docker-openvpn@.service index abd6100..f855e94 100644 --- a/init/docker-openvpn@.service +++ b/init/docker-openvpn@.service @@ -16,8 +16,9 @@ Environment="DATA_VOL=ovpn-data-%i" Environment="IMG=kylemanna/openvpn:dev" Environment="PORT=1194:1194/udp" -# Override defaults in env file -EnvironmentFile=-/etc/default/docker-openvpn-%i +# To override environment variables, use local configuration directory: +# /etc/systemd/system/docker-openvpn@foo.d/local.conf +# http://www.freedesktop.org/software/systemd/man/systemd.unit.html # Clean-up bad state if still hanging around ExecStartPre=-/usr/bin/docker rm -f $NAME