From 530423d490a6dba616a45ead4842ce7981c22fd2 Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Fri, 1 Mar 2019 14:17:48 +0530 Subject: [PATCH] config: Revert changes in freedombox.conf to avoid conffile prompt The changes made to freedombox.conf in moving the apache homepage configuration to an external file freedombox-apache-homepage.conf will cause a conffile prompt when upgrading to freedombox 19.2. Reverting changes in freedombox.conf to avoid this. Signed-off-by: Joseph Nuthalapati Reviewed-by: Sunil Mohan Adapa --- data/etc/apache2/conf-available/freedombox.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/etc/apache2/conf-available/freedombox.conf b/data/etc/apache2/conf-available/freedombox.conf index f5710dcbd..2571ac736 100644 --- a/data/etc/apache2/conf-available/freedombox.conf +++ b/data/etc/apache2/conf-available/freedombox.conf @@ -4,8 +4,11 @@ Header set Strict-Transport-Security "max-age=31536000; includeSubDomains" env=HTTPS ## -## Provide /freedombox as an alias to /plinth +## Redirect traffic on home to /plinth as part of turning the machine +## into FreedomBox server. Plinth then acts as a portal to reach all +## other services. ## +RedirectMatch "^/$" "/plinth" RedirectMatch "^/freedombox" "/plinth" ##