Merge pull request #1101 from nscuro/backport-pr-1078

nscuro · web-flow · commit f0744b95abcc · 2024-11-29T17:45:20.000+01:00
diff --git a/docker/docker-entrypoint.d/10-listen-on-ipv6-by-default.sh b/docker/docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
@@ -13,7 +13,7 @@ entrypoint_log() {
 }
 
 ME=$(basename $0)
-DEFAULT_CONF_FILE="etc/nginx/conf.d/default.conf.template"
+DEFAULT_CONF_FILE="etc/nginx/templates/default.conf.template"
 
 # check if we have ipv6 available
 if [ ! -f "/proc/net/if_inet6" ]; then

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ entrypoint_log() {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`ME=$(basename $0)`
`16`		`-DEFAULT_CONF_FILE="etc/nginx/conf.d/default.conf.template"`
	`16`	`+DEFAULT_CONF_FILE="etc/nginx/templates/default.conf.template"`
`17`	`17`
`18`	`18`	`# check if we have ipv6 available`
`19`	`19`	`if [ ! -f "/proc/net/if_inet6" ]; then`