Merge branch 'trunk'

This commit is contained in:
Vincent BRIDIER 2025-12-12 15:47:29 +01:00
commit b7ead5abca
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
2 changed files with 9 additions and 1 deletions

View file

@ -21,6 +21,7 @@
collation = "utf8mb4_0900_ai_ci"
[General]
force_ssl = 1
proxy_client_headers[] = "HTTP_X_FORWARDED_FOR"
proxy_host_headers[] = "HTTP_X_FORWARDED_HOST"
salt = "${APP_MATOMO_SALT}"

View file

@ -11,4 +11,11 @@ USER ${USER}
COPY --chown=${USER}:${USER} ./config/config.ini.php /var/www/html/config/config.ini.php
RUN printf "RewriteEngine On\nRewriteRule ^unicorn$ matomo.js [L]\nRewriteRule ^rainbow$ matomo.php [L]\n" > /var/www/html/.htaccess
RUN printf "Options +FollowSymLinks\n\
RewriteEngine On\n\
# Block sensitive dirs\n\
RewriteRule ^\.git(/|$) - [F,L]\n\
RewriteRule ^(core|config|lang|tmp)(/|$) - [F,L]\n\
# Existing rules\n\
RewriteRule ^unicorn$ matomo.js [L]\n\
RewriteRule ^rainbow$ matomo.php [L]\n" > /var/www/html/.htaccess