systemd: Specify default config file path in unit file (gravitational…

…#30442) * systemd: Specify default config file path in unit file Fixes gravitational#30306 * Also update 'teleport install systemd' * Format file with gci
Somith11 · Aug 14, 2023 · 9d7106f · 9d7106f
1 parent e572328
commit 9d7106f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/examples/systemd/fips/teleport.service b/examples/systemd/fips/teleport.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=Teleport Service FIPS 
+Description=Teleport Service FIPS
 After=network.target
 
 [Service]
 Type=simple
 Restart=on-failure
 EnvironmentFile=-/etc/default/teleport
-ExecStart=/usr/local/bin/teleport start --fips --pid-file=/run/teleport.pid
+ExecStart=/usr/local/bin/teleport start --config /etc/teleport.yaml --fips --pid-file=/run/teleport.pid
 ExecReload=/bin/kill -HUP $MAINPID
 PIDFile=/run/teleport.pid
 LimitNOFILE=524288

diff --git a/examples/systemd/teleport.service b/examples/systemd/teleport.service
@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 Restart=on-failure
 EnvironmentFile=-/etc/default/teleport
-ExecStart=/usr/local/bin/teleport start --pid-file=/run/teleport.pid
+ExecStart=/usr/local/bin/teleport start --config /etc/teleport.yaml --pid-file=/run/teleport.pid
 ExecReload=/bin/kill -HUP $MAINPID
 PIDFile=/run/teleport.pid
 LimitNOFILE=524288

diff --git a/lib/config/systemd.go b/lib/config/systemd.go
@@ -20,6 +20,8 @@ import (
 	"text/template"
 
 	"github.com/gravitational/trace"
+
+	"github.com/gravitational/teleport/lib/defaults"
 )
 
 const (
@@ -40,7 +42,7 @@ After=network.target
 Type=simple
 Restart=on-failure
 EnvironmentFile=-{{ .EnvironmentFile }}
-ExecStart={{ .TeleportInstallationFile }} start --pid-file={{ .PIDFile }}
+ExecStart={{ .TeleportInstallationFile }} start --config {{ .TeleportConfigPath }} --pid-file={{ .PIDFile }}
 ExecReload=/bin/kill -HUP $MAINPID
 PIDFile={{ .PIDFile }}
 LimitNOFILE={{ .FileDescriptorLimit }}
@@ -58,6 +60,8 @@ type SystemdFlags struct {
 	FileDescriptorLimit int
 	// TeleportInstallationFile is the teleport installation path provided by the user.
 	TeleportInstallationFile string
+	// TeleportConfigPath is the path to the teleport config file (as set by Teleport defaults)
+	TeleportConfigPath string
 }
 
 // CheckAndSetDefaults checks and sets default values for the flags.
@@ -69,6 +73,8 @@ func (f *SystemdFlags) CheckAndSetDefaults() error {
 		}
 		f.TeleportInstallationFile = teleportPath
 	}
+	// set Teleport config path to the default
+	f.TeleportConfigPath = defaults.ConfigFilePath
 
 	return nil
 }

diff --git a/lib/config/testdata/TestWriteSystemdUnitFile.golden b/lib/config/testdata/TestWriteSystemdUnitFile.golden
@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 Restart=on-failure
 EnvironmentFile=-/custom/env/dir/teleport
-ExecStart=/custom/install/dir/teleport start --pid-file=/custom/pid/dir/teleport.pid
+ExecStart=/custom/install/dir/teleport start --config /etc/teleport.yaml --pid-file=/custom/pid/dir/teleport.pid
 ExecReload=/bin/kill -HUP $MAINPID
 PIDFile=/custom/pid/dir/teleport.pid
 LimitNOFILE=16384