From b2f019aaca94821a0cb72126abe25bec706dbcd0 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Fri, 9 Aug 2024 00:06:14 +0200
Subject: Add option to use PROXY protocol

---
 conf.d/httpd.conf | 2 ++
 entrypoint.sh     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/conf.d/httpd.conf b/conf.d/httpd.conf
index 21558de..3dbac21 100644
--- a/conf.d/httpd.conf
+++ b/conf.d/httpd.conf
@@ -4,6 +4,7 @@ LoadModule dir_module        lib/apache2/mod_dir.so
 LoadModule log_config_module lib/apache2/mod_log_config.so
 LoadModule mime_module       lib/apache2/mod_mime.so
 LoadModule mpm_event_module  lib/apache2/mod_mpm_event.so
+LoadModule remoteip_module   lib/apache2/mod_remoteip.so
 LoadModule rewrite_module    lib/apache2/mod_rewrite.so
 LoadModule setenvif_module   lib/apache2/mod_setenvif.so
 LoadModule unixd_module      lib/apache2/mod_unixd.so
@@ -36,6 +37,7 @@ CustomLog /dev/stdout proxy env=proxied
 	DirectoryIndex cgit.cgi
 
 	RewriteEngine on
+	RemoteIPProxyProtocol ${HTTPD_PROXY_PROTOCOL}
 
 	# Pretty URLs
 	RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/entrypoint.sh b/entrypoint.sh
index 5375491..73cce7e 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -12,6 +12,7 @@ export CGITRC_SNAPSHOTS="${CGITRC_SNAPSHOTS:-"tar.gz"}"
 export HOSTNAME="${HOSTNAME:-"$(hostname -f)"}"
 export HTTPD_GROUP="${HTTPD_GROUP:-"1000"}"
 export HTTPD_LISTEN_PORT="${HTTPD_LISTEN_PORT:-"80"}"
+export HTTPD_PROXY_PROTOCOL="${HTTPD_PROXY_PROTOCOL:-"off"}"
 export HTTPD_USER="${HTTPD_USER:-"1000"}"
 
 # Output debugging info
-- 
cgit v1.2.3