Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v15] Update ExecReload in all Teleport systemd unit files #39082

Merged
merged 2 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion assets/aws/files/system/teleport-acm.service
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Restart=always
RestartSec=5
RuntimeDirectory=teleport
ExecStart=/usr/local/bin/teleport start --config=/etc/teleport.yaml --diag-addr=127.0.0.1:3000 --pid-file=/run/teleport/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport/teleport.pid"
PIDFile=/run/teleport/teleport.pid
LimitNOFILE=524288
3 changes: 2 additions & 1 deletion assets/aws/files/system/teleport-auth.service
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ Restart=always
RestartSec=5
RuntimeDirectory=teleport
ExecStart=/usr/local/bin/teleport start --config=/etc/teleport.yaml --diag-addr=127.0.0.1:3000 --pid-file=/run/teleport/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport/teleport.pid"
PIDFile=/run/teleport/teleport.pid
LimitNOFILE=524288

Expand Down
3 changes: 2 additions & 1 deletion assets/aws/files/system/teleport-node.service
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ RestartSec=5
RuntimeDirectory=teleport
ExecStartPre=/usr/local/bin/teleport-ssm-get-token
ExecStart=/usr/local/bin/teleport start --config=/etc/teleport.yaml --diag-addr=127.0.0.1:3000 --pid-file=/run/teleport/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport/teleport.pid"
PIDFile=/run/teleport/teleport.pid
LimitNOFILE=524288

Expand Down
3 changes: 2 additions & 1 deletion assets/aws/files/system/teleport-proxy-acm.service
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RuntimeDirectory=teleport
EnvironmentFile=/etc/teleport.d/conf
ExecStartPre=/usr/local/bin/teleport-ssm-get-token
ExecStart=/usr/local/bin/teleport start --config=/etc/teleport.yaml --diag-addr=127.0.0.1:3000 --pid-file=/run/teleport/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport/teleport.pid"
PIDFile=/run/teleport/teleport.pid
LimitNOFILE=524288

Expand Down
3 changes: 2 additions & 1 deletion assets/aws/files/system/teleport-proxy.service
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ EnvironmentFile=/etc/teleport.d/conf
ExecStartPre=/usr/local/bin/teleport-ssm-get-token
ExecStartPre=/bin/aws s3 sync s3://${TELEPORT_S3_BUCKET}/live/${TELEPORT_DOMAIN_NAME} /var/lib/teleport
ExecStart=/usr/local/bin/teleport start --config=/etc/teleport.yaml --diag-addr=127.0.0.1:3000 --pid-file=/run/teleport/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport/teleport.pid"
PIDFile=/run/teleport/teleport.pid
LimitNOFILE=524288

Expand Down
3 changes: 2 additions & 1 deletion assets/aws/files/system/teleport.service
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ RestartSec=5
RuntimeDirectory=teleport
ExecStartPre=/usr/local/bin/teleport-all-pre-start
ExecStart=/usr/local/bin/teleport start --config=/etc/teleport.yaml --diag-addr=127.0.0.1:3000 --pid-file=/run/teleport/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport/teleport.pid"
PIDFile=/run/teleport/teleport.pid
LimitNOFILE=524288

Expand Down
3 changes: 2 additions & 1 deletion examples/systemd/fips/teleport.service
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Type=simple
Restart=on-failure
EnvironmentFile=-/etc/default/teleport
ExecStart=/usr/local/bin/teleport start --config /etc/teleport.yaml --fips --pid-file=/run/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport.pid"
PIDFile=/run/teleport.pid
LimitNOFILE=524288

Expand Down
3 changes: 2 additions & 1 deletion examples/systemd/production/auth/teleport.service
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ Restart=on-failure
# --roles='proxy,auth,node' is the default value
# if none is set
ExecStart=/usr/local/bin/teleport start --roles=auth --config=/etc/teleport.yaml --diag-addr=127.0.0.1:3000 --pid-file=/run/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport.pid"
PIDFile=/run/teleport.pid
LimitNOFILE=524288

Expand Down
3 changes: 2 additions & 1 deletion examples/systemd/production/node/teleport.service
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ Restart=on-failure
# --roles='proxy,auth,node' is the default value
# if none is set
ExecStart=/usr/local/bin/teleport start --roles=node --config=/etc/teleport.yaml --pid-file=/run/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport.pid"
PIDFile=/run/teleport.pid
LimitNOFILE=524288

Expand Down
3 changes: 2 additions & 1 deletion examples/systemd/production/proxy/teleport.service
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ Restart=on-failure
# --roles='proxy,auth,node' is the default value
# if none is set
ExecStart=/usr/local/bin/teleport start --roles=proxy --config=/etc/teleport.yaml --pid-file=/run/teleport.pid
ExecReload=pkill -HUP -L -F /run/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport.pid"
PIDFile=/run/teleport.pid
LimitNOFILE=524288

Expand Down
1 change: 1 addition & 0 deletions examples/systemd/teleport.service
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Type=simple
Restart=on-failure
EnvironmentFile=-/etc/default/teleport
ExecStart=/usr/local/bin/teleport start --config /etc/teleport.yaml --pid-file=/run/teleport.pid
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport.pid"
PIDFile=/run/teleport.pid
LimitNOFILE=524288
Expand Down
3 changes: 2 additions & 1 deletion lib/config/systemd.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ Type=simple
Restart=on-failure
EnvironmentFile=-{{ .EnvironmentFile }}
ExecStart={{ .TeleportInstallationFile }} start --config {{ .TeleportConfigPath }} --pid-file={{ .PIDFile }}
ExecReload=pkill -HUP -L -F "{{ .PIDFile }}"
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F {{ .PIDFile }}"
PIDFile={{ .PIDFile }}
LimitNOFILE={{ .FileDescriptorLimit }}

Expand Down
3 changes: 2 additions & 1 deletion lib/config/testdata/TestWriteSystemdUnitFile.golden
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Type=simple
Restart=on-failure
EnvironmentFile=-/custom/env/dir/teleport
ExecStart=/custom/install/dir/teleport start --config /etc/teleport.yaml --pid-file=/custom/pid/dir/teleport.pid
ExecReload=pkill -HUP -L -F "/custom/pid/dir/teleport.pid"
# systemd before 239 needs an absolute path
ExecReload=/bin/sh -c "exec pkill -HUP -L -F /custom/pid/dir/teleport.pid"
PIDFile=/custom/pid/dir/teleport.pid
LimitNOFILE=16384

Expand Down
Loading