wallabag/docker
1
0
Fork 1
mirror of https://github.com/wallabag/docker.git synced 2026-02-27 20:27:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

prevent replace of existing vars

Browse Source 
Signed-off-by: Frank Kloeker <frank.kloeker@telekom.de>
This commit is contained in:
Frank Kloeker
2025-05-05 16:58:51 +02:00
parent eb038898ea
commit b55f138b84
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
root/entrypoint.sh
View File

@ -29,7 +29,7 @@ provisioner() {
# Replace environment variables
envsubst < /etc/wallabag/parameters.template.yml > app/config/parameters.yml
envsubst < /etc/wallabag/php-wallabag.template.ini > /etc/php81/conf.d/50_wallabag.ini
envsubst '${FASTCGI_READ_TIMEOUT}' < /etc/wallabag/nginx.template.conf > /etc/nginx/nginx.conf
envsubst '${FASTCGI_READ_TIMEOUT}' < /etc/wallabag/nginx.template.conf | sed 's/\$\${/\${/g' > /etc/nginx/nginx.conf
# Wait for external database
if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_mysql" ] || [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] ; then

14
root/etc/wallabag/nginx.template.conf
View File

@ -25,8 +25,8 @@ http {
open_file_cache max=100;
client_max_body_size 100M;
map $http_x_forwarded_proto $fe_https {
default $https;
map $$http_x_forwarded_proto $$fe_https {
default $$https;
https on;
}
@ -41,12 +41,12 @@ http {
location / {
# try to serve file directly, fallback to app.php
try_files $uri /app.php$is_args$args;
try_files $$uri /app.php$$is_args$$args;
}
location ~ ^/app\.php(/|$) {
location ~ ^/app\.php(/|$$) {
fastcgi_pass php-upstream;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
fastcgi_split_path_info ^(.+\.php)(/.*)$$;
include fastcgi_params;
# When you are using symlinks to link the document root to the
# current version of your application, you should pass the real
@ -55,8 +55,8 @@ http {
# Otherwise, PHP's OPcache may not properly detect changes to
# your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
# for more information).
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
fastcgi_param DOCUMENT_ROOT $realpath_root;
fastcgi_param SCRIPT_FILENAME $$realpath_root$$fastcgi_script_name;
fastcgi_param DOCUMENT_ROOT $$realpath_root;
fastcgi_read_timeout ${FASTCGI_READ_TIMEOUT:-300s};
# Prevents URIs that include the front controller. This will 404:
# http://domain.tld/app.php/some-path