Show real client remote IP in logs instead of internal container’s IP

friendica · Feb 8, 2025 · 93e2020 · 93e2020
1 parent 9fd34d4
commit 93e2020
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/2024.12/fpm-alpine/Dockerfile b/2024.12/fpm-alpine/Dockerfile
@@ -129,6 +129,8 @@ RUN set -ex; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
+    \
+        echo 'access.format ="%{HTTP_X_FORWARDED_FOR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \

diff --git a/2024.12/fpm/Dockerfile b/2024.12/fpm/Dockerfile
@@ -150,6 +150,8 @@ RUN set -ex; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
+    \
+        echo 'access.format ="%{HTTP_X_FORWARDED_FOR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \

diff --git a/2025.02-dev/fpm-alpine/Dockerfile b/2025.02-dev/fpm-alpine/Dockerfile
@@ -129,6 +129,8 @@ RUN set -ex; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
+    \
+        echo 'access.format ="%{HTTP_X_FORWARDED_FOR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \

diff --git a/2025.02-dev/fpm/Dockerfile b/2025.02-dev/fpm/Dockerfile
@@ -150,6 +150,8 @@ RUN set -ex; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
+    \
+        echo 'access.format ="%{HTTP_X_FORWARDED_FOR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -128,6 +128,8 @@ RUN set -ex; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
+    \
+        echo 'access.format ="%{HTTP_X_FORWARDED_FOR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -149,6 +149,8 @@ RUN set -ex; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
+    \
+        echo 'access.format ="%{HTTP_X_FORWARDED_FOR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \