Commit c824c3bc authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Add support for multiple env files for systemd unit

parent fd4d226e
...@@ -728,7 +728,9 @@ WantedBy=multi-user.target ...@@ -728,7 +728,9 @@ WantedBy=multi-user.target
[Service] [Service]
Type=${SYSTEMD_TYPE} Type=${SYSTEMD_TYPE}
EnvironmentFile=${FILE_K3S_ENV} EnvironmentFile=-/etc/default/%N
EnvironmentFile=-/etc/sysconfig/%N
EnvironmentFile=-${FILE_K3S_ENV}
KillMode=process KillMode=process
Delegate=yes Delegate=yes
# Having non-zero Limit*s causes performance problems due to accounting overhead # Having non-zero Limit*s causes performance problems due to accounting overhead
......
...@@ -6,6 +6,8 @@ Wants=network-online.target ...@@ -6,6 +6,8 @@ Wants=network-online.target
[Service] [Service]
Type=notify Type=notify
EnvironmentFile=-/etc/default/%N
EnvironmentFile=-/etc/sysconfig/%N
EnvironmentFile=-/etc/systemd/system/k3s.service.env EnvironmentFile=-/etc/systemd/system/k3s.service.env
ExecStart=/usr/local/bin/k3s server ExecStart=/usr/local/bin/k3s server
KillMode=process KillMode=process
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment