add a certbot deploy hook

4 files changed, 34 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9274cea01d68..777736bc2c8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = netkit-telnet-ssl
 	pkgdesc = Telnet client and server with TLS support (Debian Netkit version)
 	pkgver = 0.17.41+0.2
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.hcs.harvard.edu/~dholland/computers/netkit.html
 	arch = i686
 	arch = x86_64
@@ -19,6 +19,7 @@ pkgbase = netkit-telnet-ssl
 	source = netkit-telnetd@.service
 	source = netkit-telnetd-ssl@.service
 	source = netkit-telnetd-ssl.acmetool.sh
+	source = netkit-telnetd-ssl.certbot.sh
 	sha256sums = 9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00
 	sha256sums = 3f8b155bc5085e37a0d836867af330f2911953055010e30f30ca46698559a0aa
 	sha256sums = 339308000345e294f0188c232bdb6cf4a22225db2efe188064f14caabd915ed4
@@ -28,7 +29,8 @@ pkgbase = netkit-telnet-ssl
 	sha256sums = a9a14476c43d65a57d50eec7e7d773ff1031cf1c13c12e84a9de5eaa14279434
 	sha256sums = 6e45cfed7968af48b59f172523934db421964e58fdb624872a831160e2848284
 	sha256sums = b4220954373f5431b127509b4344dad32d5c692871c536106507fa8b052ef40a
-	sha256sums = f59cab8283d1eb5982e74caa8cdb4536621ced36e399e746f6e203de3b60b9bc
+	sha256sums = bc443e12d5674ee0533538c76d75e28a24ea663df51eb152cc065c235e7ffccc
+	sha256sums = 53b9c11502995ee5bc80a6a970c8b0ba27f39cca460bf00e38c7cb1eaa9d7228
 
 pkgname = netkit-telnet-ssl
 
diff --git a/PKGBUILD b/PKGBUILD
index 424567a62297..a04c16a39cd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netkit-telnet-ssl
 _debver=0.17.41+0.2
 _debrel=3
 pkgver=$_debver
-pkgrel=3
+pkgrel=4
 pkgdesc="Telnet client and server with TLS support (Debian Netkit version)"
 arch=('i686' 'x86_64')
 depends=('glibc' 'openssl' 'ncurses')
@@ -19,7 +19,8 @@ source=(https://deb.debian.org/debian/pool/main/n/${pkgname}/${pkgname}_${_debve
         netkit-telnet-ssl.tmpfiles
         netkit-telnetd{,-ssl}.socket
         netkit-telnetd{,-ssl}@.service
-        netkit-telnetd-ssl.acmetool.sh)
+        netkit-telnetd-ssl.acmetool.sh
+        netkit-telnetd-ssl.certbot.sh)
 sha256sums=('9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00'
             '3f8b155bc5085e37a0d836867af330f2911953055010e30f30ca46698559a0aa'
             '339308000345e294f0188c232bdb6cf4a22225db2efe188064f14caabd915ed4'
@@ -29,7 +30,8 @@ sha256sums=('9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00'
             'a9a14476c43d65a57d50eec7e7d773ff1031cf1c13c12e84a9de5eaa14279434'
             '6e45cfed7968af48b59f172523934db421964e58fdb624872a831160e2848284'
             'b4220954373f5431b127509b4344dad32d5c692871c536106507fa8b052ef40a'
-            'f59cab8283d1eb5982e74caa8cdb4536621ced36e399e746f6e203de3b60b9bc')
+            'bc443e12d5674ee0533538c76d75e28a24ea663df51eb152cc065c235e7ffccc'
+            '53b9c11502995ee5bc80a6a970c8b0ba27f39cca460bf00e38c7cb1eaa9d7228')
 
 prepare() {
   cd netkit-telnet-0.17
@@ -75,6 +77,9 @@ package() {
 
   install -D -m 755 "$srcdir"/netkit-telnetd-ssl.acmetool.sh \
                     "$pkgdir"/etc/acme/hooks/netkit-telnetd-ssl
+
+  install -D -m 755 "$srcdir"/netkit-telnetd-ssl.certbot.sh \
+                    "$pkgdir"/etc/letsencrypt/renew-hooks/deploy/netkit-telnetd-ssl
 }
 
 # cleanbuild: required
diff --git a/netkit-telnetd-ssl.acmetool.sh b/netkit-telnetd-ssl.acmetool.sh
index 21df87fa8dc0..21be54e23cc7 100755
--- a/netkit-telnetd-ssl.acmetool.sh
+++ b/netkit-telnetd-ssl.acmetool.sh
@@ -1,14 +1,11 @@
 #!/bin/sh
 set -e
 
-EVENT_NAME="$1"
-[ "$EVENT_NAME" = "live-updated" ] || exit 42
-
+[ "$1" = "live-updated" ] || exit 42
 [ "$ACME_STATE_DIR" ] || ACME_STATE_DIR="/var/lib/acme"
 [ "$TELNETD_PEM_FILE" ] || TELNETD_PEM_FILE="/etc/telnetd-ssl/telnetd.pem"
 [ "$TELNETD_CERT_NAME" ] || TELNETD_CERT_NAME="$(hostname -f)"
-
-[ -e "${TELNETD_PEM_FILE}.acmetool" ] || exit 0
+[ -e "$TELNETD_PEM_FILE.acmetool" ] || exit 0
 
 umask 0077
 while read name; do
diff --git a/netkit-telnetd-ssl.certbot.sh b/netkit-telnetd-ssl.certbot.sh
new file mode 100755
index 000000000000..b8d0de4dd264
--- /dev/null
+++ b/netkit-telnetd-ssl.certbot.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+[ "$TELNETD_PEM_FILE" ] || TELNETD_PEM_FILE="/etc/telnetd-ssl/telnetd.pem"
+[ "$TELNETD_CERT_NAME" ] || TELNETD_CERT_NAME="$(hostname -f)"
+[ -e "$TELNETD_PEM_FILE.certbot" ] || exit 0
+
+umask 0077
+for name in $RENEWED_DOMAINS; do
+	[ "$name" = "$TELNETD_CERT_NAME" ] || continue
+
+	cert="$RENEWED_LINEAGE/fullchain.pem"
+	pkey="$RENEWED_LINEAGE/privkey.pem"
+
+	[ -f "$cert" ] && [ -f "$pkey" ] || continue
+
+	mkdir -p "${TELNETD_PEM_FILE%/*}"
+	cat "$pkey" "$cert" > "$TELNETD_PEM_FILE"
+	chown _telnetd: "$TELNETD_PEM_FILE"
+done