[systemd] apply sysconfig/default settings on launch too. (#3489)

DataDog · Aug 24, 2017 · 8828728 · 8828728
1 parent 5dade5d
commit 8828728
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/packaging/datadog-agent.service b/packaging/datadog-agent.service
@@ -5,6 +5,8 @@ After=network.target
 [Service]
 Type=forking
 User=dd-agent
+EnvironmentFile=-/etc/default/datadog-agent
+EnvironmentFile=-/etc/sysconfig/datadog-agent
 ExecStart=/opt/datadog-agent/bin/start_agent.sh
 ExecStop=/opt/datadog-agent/bin/supervisorctl -c /etc/dd-agent/supervisor.conf shutdown
 

diff --git a/packaging/start_agent.sh b/packaging/start_agent.sh
@@ -5,4 +5,9 @@
 
 PATH=/opt/datadog-agent/embedded/bin:/opt/datadog-agent/bin:$PATH
 
+if [ "$DATADOG_ENABLED" = "no" ]; then
+    echo "Disabled via DATADOG_ENABLED env var. Exiting."
+    exit 0
+fi
+
 exec /opt/datadog-agent/bin/supervisord -c /etc/dd-agent/supervisor.conf