From 59283f3102b1c1304080f4e38613ab06df725aa8 Mon Sep 17 00:00:00 2001
From: Maarten de Boer <maarten@aery.nl>
Date: Tue, 21 May 2024 19:04:42 +0200
Subject: [PATCH] Update service definitions

---
 .SRCINFO          |  8 ++++----
 PKGBUILD          |  8 ++++----
 teleport.install  |  2 +-
 teleport.service  | 12 ++++++------
 teleport@.service | 16 ++++++++--------
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index b72b93d..eea305e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = teleport-bin
 	pkgdesc = Modern SSH server for teams managing distributed infrastructure
 	pkgver = 15.3.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://goteleport.com/
 	install = teleport.install
 	arch = i386
@@ -18,9 +18,9 @@ pkgbase = teleport-bin
 	source = teleport.service
 	source = teleport@.service
 	source = teleport.install
-	sha256sums = 22fd1ee136e9422458740811c9946de447105f26e87dbbc8daa35d17bd1f3894
-	sha256sums = 21ca4e56c9c5e1ce11570894e85ded853e26e91cc2e16ed9114b3d6a2c5c22ef
-	sha256sums = ce2dd61cae3c0c3684e7e629f98b77551e66ddedca2194250a34f0efbc674f3a
+	sha256sums = b7ac1b9fa9788989b9cef9e555b278635faa4be8350a959580f19076241cde85
+	sha256sums = b7aa05eeb0d39875481c56bc21edf60a5bd7184bc5c424df68a5d4eb2b2882f1
+	sha256sums = c71bbe70179aceb0f49d2a4f1e0a83da040ca72373e17ca82cc2489cd6e07801
 	source_i386 = teleport-bin-15.3.5-i386.tar.gz::https://get.gravitational.com/teleport-v15.3.5-linux-386-bin.tar.gz
 	sha256sums_i386 = e24e4f74b3255fa35972c41449f6dd513a9015ecd3a8f185467de536d994b4d6
 	source_x86_64 = teleport-bin-15.3.5-x86_64.tar.gz::https://get.gravitational.com/teleport-v15.3.5-linux-amd64-bin.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index f775b4a..df873b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=teleport
 pkgname=teleport-bin
 pkgver=15.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern SSH server for teams managing distributed infrastructure"
 arch=('i386' 'x86_64' 'armv7h' 'aarch64')
 url="https://goteleport.com/"
@@ -29,9 +29,9 @@ source_x86_64=("teleport-bin-${pkgver}-x86_64.tar.gz::https://get.gravitational.
 source_armv7h=("teleport-bin-${pkgver}-armv7h.tar.gz::https://get.gravitational.com/teleport-v${pkgver}-linux-arm-bin.tar.gz")
 source_aarch64=("teleport-bin-${pkgver}-aarch64.tar.gz::https://get.gravitational.com/teleport-v${pkgver}-linux-arm64-bin.tar.gz")
 
-sha256sums=('22fd1ee136e9422458740811c9946de447105f26e87dbbc8daa35d17bd1f3894'
-            '21ca4e56c9c5e1ce11570894e85ded853e26e91cc2e16ed9114b3d6a2c5c22ef'
-            'ce2dd61cae3c0c3684e7e629f98b77551e66ddedca2194250a34f0efbc674f3a')
+sha256sums=('b7ac1b9fa9788989b9cef9e555b278635faa4be8350a959580f19076241cde85'
+            'b7aa05eeb0d39875481c56bc21edf60a5bd7184bc5c424df68a5d4eb2b2882f1'
+            'c71bbe70179aceb0f49d2a4f1e0a83da040ca72373e17ca82cc2489cd6e07801')
 sha256sums_i386=('e24e4f74b3255fa35972c41449f6dd513a9015ecd3a8f185467de536d994b4d6')
 sha256sums_x86_64=('ff52e082ca67e025bf607e0955c8e12e1297d24845fd90cefb94b1bf9a4481ef')
 sha256sums_armv7h=('6044c3cc69b081f93590a6757701a9beda9f72be124b8c93470405b1b965a8d0')
diff --git a/teleport.install b/teleport.install
index b8c0e55..c25a48c 100644
--- a/teleport.install
+++ b/teleport.install
@@ -1,3 +1,3 @@
 post_install() {
-	echo 'Please follow the instructions on https://gravitational.com/teleport/docs/quickstart/ to set things up.'
+	echo 'Please follow the instructions on https://goteleport.com/docs/ to get started.'
 }
diff --git a/teleport.service b/teleport.service
index 720674a..52593fa 100644
--- a/teleport.service
+++ b/teleport.service
@@ -1,16 +1,16 @@
 [Unit]
-Description=Teleport SSH Service
+Description=Teleport Service
 After=network.target
 
 [Service]
 Type=simple
 Restart=on-failure
-WorkingDirectory=/etc/teleport
-EnvironmentFile=-/etc/teleport/teleport-env.conf
-ExecStart=/usr/bin/teleport start --pid-file=/run/teleport.pid --config teleport.yaml
-ExecReload=/bin/kill -HUP $MAINPID
+RestartSec=5
+EnvironmentFile=-/etc/default/teleport
+ExecStart=/usr/local/bin/teleport start --config /etc/teleport.yaml --pid-file=/run/teleport.pid
+ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport.pid"
 PIDFile=/run/teleport.pid
-LimitNOFILE=8192
+LimitNOFILE=524288
 
 [Install]
 WantedBy=multi-user.target
diff --git a/teleport@.service b/teleport@.service
index 3b0753f..fd91eac 100644
--- a/teleport@.service
+++ b/teleport@.service
@@ -1,16 +1,16 @@
 [Unit]
-Description=Teleport SSH Service
+Description=Teleport Service
 After=network.target
 
 [Service]
 Type=simple
 Restart=on-failure
-WorkingDirectory=/etc/teleport
-EnvironmentFile=-/etc/teleport/%i-env.conf
-ExecStart=/usr/bin/teleport start --pid-file=/run/teleport.pid --config %i.yaml
-ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/run/teleport.pid
-LimitNOFILE=8192
+RestartSec=5
+EnvironmentFile=-/etc/default/teleport-%i
+ExecStart=/usr/local/bin/teleport start --config /etc/teleport-%i.yaml --pid-file=/run/teleport-%i.pid
+ExecReload=/bin/sh -c "exec pkill -HUP -L -F /run/teleport-%i.pid"
+PIDFile=/run/teleport-%i.pid
+LimitNOFILE=524288
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target