From 6d117382432a42a5075baff9b438cb5376ca521b Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Wed, 28 Aug 2024 08:39:16 +0200
Subject: [PATCH] fix/enhance Apache template for file authentication

---
 contrib/apache/radicale.conf | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/contrib/apache/radicale.conf b/contrib/apache/radicale.conf
index 7499be61..98a25a72 100644
--- a/contrib/apache/radicale.conf
+++ b/contrib/apache/radicale.conf
@@ -57,13 +57,15 @@
 		Require all granted
 		</IfDefine>
 
-		## You may want to use apache's authentication (config: [auth] type = remote_user)
+		## You may want to use apache's authentication (config: [auth] type = http_x_remote_user)
+		##  e.g. create a new file with a testuser: htpasswd -c -B /etc/httpd/conf/htpasswd-radicale testuser
 		#AuthBasicProvider file
 		#AuthType Basic
 		#AuthName "Enter your credentials"
-		#AuthUserFile /path/to/httpdfile/
+		#AuthUserFile /etc/httpd/conf/htpasswd-radicale
 		#AuthGroupFile /dev/null
 		#Require valid-user
+		#RequestHeader set X-Remote-User expr=%{REMOTE_USER}
 
 		<IfDefine RADICALE_ENFORCE_SSL>
 			<IfModule !ssl_module>
@@ -106,13 +108,15 @@
 		Require all granted
 		</IfDefine>
 
-		## You may want to use apache's authentication (config: [auth] type = remote_user)
+		## You may want to use apache's authentication (config: [auth] type = http_x_remote_user)
+		##  e.g. create a new file with a testuser: htpasswd -c -B /etc/httpd/conf/htpasswd-radicale testuser
 		#AuthBasicProvider file
 		#AuthType Basic
 		#AuthName "Enter your credentials"
-		#AuthUserFile /path/to/httpdfile/
+		#AuthUserFile /etc/httpd/conf/htpasswd-radicale
 		#AuthGroupFile /dev/null
 		#Require valid-user
+		#RequestHeader set X-Remote-User expr=%{REMOTE_USER}
 
 		<IfDefine RADICALE_ENFORCE_SSL>
 			<IfModule !ssl_module>
@@ -179,11 +183,12 @@ CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 		Require all granted
 		</IfDefine>
 
-		## You may want to use apache's authentication (config: [auth] type = remote_user)
+		## You may want to use apache's authentication (config: [auth] type = http_x_remote_user)
+		##  e.g. create a new file with a testuser: htpasswd -c -B /etc/httpd/conf/htpasswd-radicale testuser
 		#AuthBasicProvider file
 		#AuthType Basic
 		#AuthName "Enter your credentials"
-		#AuthUserFile /path/to/httpdfile/
+		#AuthUserFile /etc/httpd/conf/htpasswd-radicale
 		#AuthGroupFile /dev/null
 		#Require valid-user
 	</Location>
@@ -221,11 +226,12 @@ CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 		Require all granted
 		</IfDefine>
 
-		## You may want to use apache's authentication (config: [auth] type = remote_user)
+		## You may want to use apache's authentication (config: [auth] type = http_x_remote_user)
+		##  e.g. create a new file with a testuser: htpasswd -c -B /etc/httpd/conf/htpasswd-radicale testuser
 		#AuthBasicProvider file
 		#AuthType Basic
 		#AuthName "Enter your credentials"
-		#AuthUserFile /path/to/httpdfile/
+		#AuthUserFile /etc/httpd/conf/htpasswd-radicale
 		#AuthGroupFile /dev/null
 		#Require valid-user
 	</Location>