Skip to content

Commit 8828728

Browse files
truthbkolivielpeau
authored andcommitted
[systemd] apply sysconfig/default settings on launch too. (#3489)
1 parent 5dade5d commit 8828728

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

packaging/datadog-agent.service

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ After=network.target
55
[Service]
66
Type=forking
77
User=dd-agent
8+
EnvironmentFile=-/etc/default/datadog-agent
9+
EnvironmentFile=-/etc/sysconfig/datadog-agent
810
ExecStart=/opt/datadog-agent/bin/start_agent.sh
911
ExecStop=/opt/datadog-agent/bin/supervisorctl -c /etc/dd-agent/supervisor.conf shutdown
1012

packaging/start_agent.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,9 @@
55

66
PATH=/opt/datadog-agent/embedded/bin:/opt/datadog-agent/bin:$PATH
77

8+
if [ "$DATADOG_ENABLED" = "no" ]; then
9+
echo "Disabled via DATADOG_ENABLED env var. Exiting."
10+
exit 0
11+
fi
12+
813
exec /opt/datadog-agent/bin/supervisord -c /etc/dd-agent/supervisor.conf

0 commit comments

Comments
 (0)