From e05a4b5eae692a0230725a7dcbabf8b8ca96b7ac Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 16 May 2023 12:00:19 -0700 Subject: [PATCH] pagekite: Drop the config file for forcing use of Debian certs See Debian bug #961984. This patch is available in Debian since version 1.5.2.200531-1. It is present in bullseye and bookworm. So it can be dropped from FreedomBox. Tests: - Untested, as the exact configuration exists in /etc/pagekite.d/90_debian_certs.rc Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- debian/freedombox.maintscript | 1 + .../data/etc/pagekite.d/90_freedombox_certs.rc | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 plinth/modules/pagekite/data/etc/pagekite.d/90_freedombox_certs.rc diff --git a/debian/freedombox.maintscript b/debian/freedombox.maintscript index 8a56abf86..1c535e07c 100644 --- a/debian/freedombox.maintscript +++ b/debian/freedombox.maintscript @@ -121,3 +121,4 @@ rm_conffile /etc/apache2/conf-available/mediawiki-freedombox.conf 23.10~ rm_conffile /etc/mediawiki/FreedomBoxStaticSettings.php 23.10~ rm_conffile /etc/apache2/conf-available/minidlna-freedombox.conf 23.10~ rm_conffile /etc/NetworkManager/dispatcher.d/10-freedombox-batman 23.10~ +rm_conffile /etc/pagekite.d/90_freedombox_certs.rc 23.10~ diff --git a/plinth/modules/pagekite/data/etc/pagekite.d/90_freedombox_certs.rc b/plinth/modules/pagekite/data/etc/pagekite.d/90_freedombox_certs.rc deleted file mode 100644 index 00d7bb4ee..000000000 --- a/plinth/modules/pagekite/data/etc/pagekite.d/90_freedombox_certs.rc +++ /dev/null @@ -1,11 +0,0 @@ -# -# This file is shipped by FreedomBox. DO NOT EDIT. -# -# This is to make Pagekite use certficates shipped by Debian. Otherwise by -# default, it uses internally shipped certificates that may be outdated. See: -# https://pagekite.wordpress.com/2020/05/30/tls-certificate-validation-issues/ -# -# If you wish to override this setting, create another file starting with a -# number higher than 90. -# -ca_certs = /etc/ssl/certs/ca-certificates.crt