Skip to content

Commit 0bd52ba

Browse files
dotneftdotneft
committed
Merge pull request #1778 from petrkle/7.4
Enable cidr in WEB_REAL_IP_FROM
1 parent 4d3a91e commit 0bd52ba

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

‎Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@ prepare_web_server() {
223223
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
224224

225225
sed -i \
226-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
226+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
227227
"$ZABBIX_CONF_DIR/nginx.conf"
228228

229229
sed -i \
230-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
230+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
231231
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
232232

233233
sed -i \

‎Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@ prepare_web_server() {
223223
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
224224

225225
sed -i \
226-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
226+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
227227
"$ZABBIX_CONF_DIR/nginx.conf"
228228

229229
sed -i \
230-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
230+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
231231
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
232232

233233
sed -i \

‎Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@ prepare_web_server() {
223223
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
224224

225225
sed -i \
226-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
226+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
227227
"$ZABBIX_CONF_DIR/nginx.conf"
228228

229229
sed -i \
230-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
230+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
231231
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
232232

233233
sed -i \

‎Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@ prepare_web_server() {
223223
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
224224

225225
sed -i \
226-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
226+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
227227
"$ZABBIX_CONF_DIR/nginx.conf"
228228

229229
sed -i \
230-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
230+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
231231
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
232232

233233
sed -i \

‎Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@ prepare_web_server() {
223223
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
224224

225225
sed -i \
226-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
226+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
227227
"$ZABBIX_CONF_DIR/nginx.conf"
228228

229229
sed -i \
230-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
230+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
231231
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
232232

233233
sed -i \

‎Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ prepare_web_server() {
225225
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
226226

227227
sed -i \
228-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
228+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
229229
"$ZABBIX_CONF_DIR/nginx.conf"
230230

231231
sed -i \
232-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
232+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
233233
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
234234

235235
sed -i \

‎Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ prepare_web_server() {
225225
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
226226

227227
sed -i \
228-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
228+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
229229
"$ZABBIX_CONF_DIR/nginx.conf"
230230

231231
sed -i \
232-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
232+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
233233
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
234234

235235
sed -i \

‎Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ prepare_web_server() {
225225
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
226226

227227
sed -i \
228-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
228+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
229229
"$ZABBIX_CONF_DIR/nginx.conf"
230230

231231
sed -i \
232-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
232+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
233233
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
234234

235235
sed -i \

‎Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ prepare_web_server() {
225225
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
226226

227227
sed -i \
228-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
228+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
229229
"$ZABBIX_CONF_DIR/nginx.conf"
230230

231231
sed -i \
232-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
232+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
233233
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
234234

235235
sed -i \

‎Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ prepare_web_server() {
225225
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
226226

227227
sed -i \
228-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
228+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
229229
"$ZABBIX_CONF_DIR/nginx.conf"
230230

231231
sed -i \
232-
-e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
232+
-e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
233233
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
234234

235235
sed -i \

0 commit comments

Comments
 (0)